summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlan Cox2009-07-17 17:17:26 +0200
committerLinus Torvalds2009-07-17 17:50:43 +0200
commitecc2e05e739c30870c8e4f252b63a0c4041f2724 (patch)
tree7d8f7ac3ac40bb2e2e8c80954256d173cc8aa46f /drivers
parentMerge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff)
downloadkernel-qcow2-linux-ecc2e05e739c30870c8e4f252b63a0c4041f2724.tar.gz
kernel-qcow2-linux-ecc2e05e739c30870c8e4f252b63a0c4041f2724.tar.xz
kernel-qcow2-linux-ecc2e05e739c30870c8e4f252b63a0c4041f2724.zip
tty_port: Fix return on interrupted use
Whoops.. fortunately not many people use this yet. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/tty_port.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
index 4e862a75f7ff..9769b1149f76 100644
--- a/drivers/char/tty_port.c
+++ b/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);