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 branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
cyclades.c
diff --git
a/drivers/tty/cyclades.c
b/drivers/tty/cyclades.c
index 345bd0e0884ef73439be07a4d81741bd7a78732e..33f83fee9faec6be78206ebbc4aeee5ba1702fc8 100644
(file)
--- a/
drivers/tty/cyclades.c
+++ b/
drivers/tty/cyclades.c
@@
-1124,14
+1124,8
@@
static void cyz_handle_cmd(struct cyclades_card *cinfo)
readl(&info->u.cyz.ch_ctrl->rs_status);
if (dcd & C_RS_DCD)
wake_up_interruptible(&info->port.open_wait);
readl(&info->u.cyz.ch_ctrl->rs_status);
if (dcd & C_RS_DCD)
wake_up_interruptible(&info->port.open_wait);
- else {
- struct tty_struct *tty;
- tty = tty_port_tty_get(&info->port);
- if (tty) {
- tty_hangup(tty);
- tty_kref_put(tty);
- }
- }
+ else
+ tty_port_tty_hangup(&info->port, false);
}
break;
case C_CM_MCTS:
}
break;
case C_CM_MCTS: