From d3e2f42b790c1825dbb3e7db46df814a66a5297e Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Fri, 17 Jul 2009 16:17:26 +0100
Subject: [PATCH] --- yaml --- r: 155513 b: refs/heads/master c:
 ecc2e05e739c30870c8e4f252b63a0c4041f2724 h: refs/heads/master i:   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 dee5edbcbb2b..5c1e50f0d740 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b0a84043e0c14088958fddb62f416d050368011
+refs/heads/master: ecc2e05e739c30870c8e4f252b63a0c4041f2724
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);