X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fchar%2Fselection.c;h=71093a9fc462ac8f562a8c8e980a7d7deceadd89;hb=a1d79aaaa564abc19b7bf3a024bb371fa7648a15;hp=5b187c895c1831fc1bf274aeaa6e7fe35f0c8244;hpb=89de09a9ba9ce293228b1f1aa3c68b5af33a70ce;p=~andy%2Flinux diff --git a/drivers/char/selection.c b/drivers/char/selection.c index 5b187c895c1..71093a9fc46 100644 --- a/drivers/char/selection.c +++ b/drivers/char/selection.c @@ -275,7 +275,8 @@ int set_selection(const struct tiocl_selection __user *sel, struct tty_struct *t int paste_selection(struct tty_struct *tty) { struct vc_data *vc = (struct vc_data *)tty->driver_data; - int pasted = 0, count; + int pasted = 0; + unsigned int count; struct tty_ldisc *ld; DECLARE_WAITQUEUE(wait, current); @@ -293,7 +294,7 @@ int paste_selection(struct tty_struct *tty) continue; } count = sel_buffer_lth - pasted; - count = min(count, tty->ldisc.receive_room(tty)); + count = min(count, tty->receive_room); tty->ldisc.receive_buf(tty, sel_buffer + pasted, NULL, count); pasted += count; }