diff options
| author | Johan Hovold <jhovold@gmail.com> | 2014-05-26 19:23:40 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-07-02 12:05:46 +0200 |
| commit | 4ed88943c847357d10658a29c9ff2244a48df7a6 (patch) | |
| tree | 5e26f14ac05a5ecaa2ec4f58c13a7657c73212d6 | |
| parent | 4d9aa622d7149e6dcc5d8d07f67d754b598a0931 (diff) | |
USB: cdc-acm: fix shutdown and suspend race
commit ed797074031a37bb9bf4a70952fffc606b77274d upstream.
We should stop I/O unconditionally at suspend rather than rely on the
tty-port initialised flag (which is set prior to stopping I/O during
shutdown) in order to prevent suspend returning with URBs still active.
Fixes: 11ea859d64b6 ("USB: additional power savings for cdc-acm devices
that support remote wakeup")
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index d89871b49f11..ae4d028b4209 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1456,8 +1456,7 @@ static int acm_suspend(struct usb_interface *intf, pm_message_t message) if (cnt) return 0; - if (test_bit(ASYNCB_INITIALIZED, &acm->port.flags)) - stop_data_traffic(acm); + stop_data_traffic(acm); return 0; } |