diff options
| author | Johan Hovold <jhovold@gmail.com> | 2014-05-26 21:23:40 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-26 23:12:39 +0400 |
| commit | 52c84b338b8b42539b1e1a9be0ffaf41e730ccc2 (patch) | |
| tree | 1a9e2428a11ca0625d03f830541665e4a3e7167e /drivers/usb/class | |
| parent | 60c64b0c78420677a41bc25e6bd2373219b100c3 (diff) | |
| download | linux-52c84b338b8b42539b1e1a9be0ffaf41e730ccc2.tar.xz | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class')
| -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 8128b503a56e..89eb04c27d41 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1470,8 +1470,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; } |