git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.7-1.492
[linux-2.6.git]
/
drivers
/
char
/
selection.c
diff --git
a/drivers/char/selection.c
b/drivers/char/selection.c
index
f08fd79
..
598f601
100644
(file)
--- a/
drivers/char/selection.c
+++ b/
drivers/char/selection.c
@@
-296,7
+296,7
@@
int paste_selection(struct tty_struct *tty)
}
count = sel_buffer_lth - pasted;
count = MIN(count, tty->ldisc.receive_room(tty));
}
count = sel_buffer_lth - pasted;
count = MIN(count, tty->ldisc.receive_room(tty));
- tty->ldisc.receive_buf(tty, sel_buffer + pasted,
0
, count);
+ tty->ldisc.receive_buf(tty, sel_buffer + pasted,
NULL
, count);
pasted += count;
}
remove_wait_queue(&vt->paste_wait, &wait);
pasted += count;
}
remove_wait_queue(&vt->paste_wait, &wait);