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);