From e16ec0801787dbd9c5b4587c8937715e2176f9d6 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Jul 2009 08:53:14 -0700
Subject: [PATCH] --- yaml --- r: 155515 b: refs/heads/master c:
 b983d0deb0e28f8880cdea79def575d96a27e603 h: refs/heads/master i:   155513:
 d3e2f42b790c1825dbb3e7db46df814a66a5297e   155511:
 83b103d507ca2bade06a63a9e52a3d703cf5a330 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/char/tty_port.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5a1c0a4eb39f..c19c1ca63cfc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04aef32d39cc4ef80087c0ce8ed113c6d64f1a6b
+refs/heads/master: b983d0deb0e28f8880cdea79def575d96a27e603
diff --git a/trunk/drivers/char/tty_port.c b/trunk/drivers/char/tty_port.c
index 4e862a75f7ff..9769b1149f76 100644
--- a/trunk/drivers/char/tty_port.c
+++ b/trunk/drivers/char/tty_port.c
@@ -267,7 +267,7 @@ int tty_port_block_til_ready(struct tty_port *port,
 	if (retval == 0)
 		port->flags |= ASYNC_NORMAL_ACTIVE;
 	spin_unlock_irqrestore(&port->lock, flags);
-	return 0;
+	return retval;
 	
 }
 EXPORT_SYMBOL(tty_port_block_til_ready);