summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-09-17 12:03:39 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-17 04:45:29 -0700
commitd83114e9754cf5deb3424217ff2f10cace1428e3 (patch)
tree55bcfb35785ec1c3f4ffed4797938c36ac567402 /drivers
parent7ac3c93e5dd74486ca4f8f0b02ae55182658d2e5 (diff)
downloadlinux-3.10-d83114e9754cf5deb3424217ff2f10cace1428e3.tar.gz
linux-3.10-d83114e9754cf5deb3424217ff2f10cace1428e3.tar.bz2
linux-3.10-d83114e9754cf5deb3424217ff2f10cace1428e3.zip
tty: Fix hvc return
HVC returns a size of -1 bytes for the write room in some cases. This is bogus and not handled by the tty layer at all. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/hvc/hvc_console.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
index 7f80f15681c..4a652999380 100644
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
@@ -558,7 +558,7 @@ static int hvc_write_room(struct tty_struct *tty)
struct hvc_struct *hp = tty->driver_data;
if (!hp)
- return -1;
+ return 0;
return hp->outbuf_size - hp->n_outbuf;
}