Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
drivers
/
tty
/
serial
/
serial_core.c
diff --git
a/kernel/drivers/tty/serial/serial_core.c
b/kernel/drivers/tty/serial/serial_core.c
index
0b7bb12
..
ec54044
100644
(file)
--- a/
kernel/drivers/tty/serial/serial_core.c
+++ b/
kernel/drivers/tty/serial/serial_core.c
@@
-1409,7
+1409,7
@@
static void uart_close(struct tty_struct *tty, struct file *filp)
mutex_lock(&port->mutex);
uart_shutdown(tty, state);
tty_port_tty_set(port, NULL);
mutex_lock(&port->mutex);
uart_shutdown(tty, state);
tty_port_tty_set(port, NULL);
- tty->closing = 0;
+
spin_lock_irqsave(&port->lock, flags);
if (port->blocked_open) {
spin_lock_irqsave(&port->lock, flags);
if (port->blocked_open) {
@@
-1435,6
+1435,7
@@
static void uart_close(struct tty_struct *tty, struct file *filp)
mutex_unlock(&port->mutex);
tty_ldisc_flush(tty);
mutex_unlock(&port->mutex);
tty_ldisc_flush(tty);
+ tty->closing = 0;
}
static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
}
static void uart_wait_until_sent(struct tty_struct *tty, int timeout)