diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:03:10 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:03:10 -0400 |
commit | 3bf2391729822e591dcfbbd1e9dd2f450968cdcb (patch) | |
tree | 80a0499e57a4cc95b6caea559400b5226ebe606f /drivers/usb/serial/quatech2.c | |
parent | 86e213e1d901fbeaf6e57d13c5edd925fadddcbe (diff) | |
parent | fd4a5aef002bb57e8a35ed34d8a878034b9bde94 (diff) |
Merge branch 'perf/urgent' into perf/core
Merge in all pending fixes, before pulling the latest development
bits from Arnaldo - which will involve merge conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/usb/serial/quatech2.c')
-rw-r--r-- | drivers/usb/serial/quatech2.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/serial/quatech2.c b/drivers/usb/serial/quatech2.c index 00e6c9bac8a3..d643a4d4d770 100644 --- a/drivers/usb/serial/quatech2.c +++ b/drivers/usb/serial/quatech2.c | |||
@@ -661,7 +661,9 @@ void qt2_process_read_urb(struct urb *urb) | |||
661 | __func__); | 661 | __func__); |
662 | break; | 662 | break; |
663 | } | 663 | } |
664 | tty_flip_buffer_push(&port->port); | 664 | |
665 | if (port_priv->is_open) | ||
666 | tty_flip_buffer_push(&port->port); | ||
665 | 667 | ||
666 | newport = *(ch + 3); | 668 | newport = *(ch + 3); |
667 | 669 | ||
@@ -704,7 +706,8 @@ void qt2_process_read_urb(struct urb *urb) | |||
704 | tty_insert_flip_string(&port->port, ch, 1); | 706 | tty_insert_flip_string(&port->port, ch, 1); |
705 | } | 707 | } |
706 | 708 | ||
707 | tty_flip_buffer_push(&port->port); | 709 | if (port_priv->is_open) |
710 | tty_flip_buffer_push(&port->port); | ||
708 | } | 711 | } |
709 | 712 | ||
710 | static void qt2_write_bulk_callback(struct urb *urb) | 713 | static void qt2_write_bulk_callback(struct urb *urb) |