projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'origin/master' of ../linux-2.6 into drm-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
char
/
tty_port.c
diff --git
a/drivers/char/tty_port.c
b/drivers/char/tty_port.c
index 4e862a75f7ff213bd62022e852a9d485b65adbbf..9769b1149f7602cf9c2c7ea1a3eab70bfad9b0a0 100644
(file)
--- 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);