git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
tty
/
vt
/
selection.c
diff --git
a/drivers/tty/vt/selection.c
b/drivers/tty/vt/selection.c
index
67b1d0d
..
fb864e7
100644
(file)
--- a/
drivers/tty/vt/selection.c
+++ b/
drivers/tty/vt/selection.c
@@
-332,7
+332,8
@@
int paste_selection(struct tty_struct *tty)
continue;
}
count = sel_buffer_lth - pasted;
- count = tty->ldisc->ops->receive_buf(tty, sel_buffer + pasted,
+ count = min(count, tty->receive_room);
+ tty->ldisc->ops->receive_buf(tty, sel_buffer + pasted,
NULL, count);
pasted += count;
}