diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:50:59 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:01:23 -0400 |
commit | 835f9c38bbb4498c3d43b7466964bdadbb1fd244 (patch) | |
tree | ade5aec66bc7ddb97048c4f141932de0f93369b9 /drivers/usb/serial/quatech2.c | |
parent | f5f29151588744ea2e283971cb0ad403ee04e3e2 (diff) | |
parent | a937536b868b8369b98967929045f1df54234323 (diff) |
Merge tag 'v3.9-rc3' into next/multiplatform
Linux 3.9-rc3
Conflicts:
arch/arm/Kconfig
arch/arm/mach-spear/spear3xx.c
arch/arm/plat-spear/Kconfig
This is a dependency for ux500/multiplatform
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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) |