From 8d713cdf49df1f3dea62ee70c97ed5ebea5d61ef Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Mon, 17 Sep 2012 12:03:39 +0100
Subject: [PATCH] --- yaml --- r: 325759 b: refs/heads/master c:
 d83114e9754cf5deb3424217ff2f10cace1428e3 h: refs/heads/master i:   325757:
 e3464ec53e2acbd05c55f07da040b97f3434b3bd   325755:
 18cb95230cdbc6280a2c3462b5ba789019ff28e1   325751:
 01658284baa50b72e55b3ef6315e268009952593   325743:
 da474aeefbd6f40a82bd5e2a01077911fd81563f   325727:
 4e0212d157072cd722ff7762ee0b794b05fb3868   325695:
 c4c87b4f26d81d83711b76aa7c040d44bb6e6952   325631:
 5c660b610b258c62739e58ceb18d238d19932b36 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/tty/hvc/hvc_console.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c4ac0dfffdbe..9f1fd6587f0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ac3c93e5dd74486ca4f8f0b02ae55182658d2e5
+refs/heads/master: d83114e9754cf5deb3424217ff2f10cace1428e3
diff --git a/trunk/drivers/tty/hvc/hvc_console.c b/trunk/drivers/tty/hvc/hvc_console.c
index 7f80f15681cd..4a652999380f 100644
--- a/trunk/drivers/tty/hvc/hvc_console.c
+++ b/trunk/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;
 }