diff options
| author | Johan Hovold <jhovold@gmail.com> | 2014-05-26 19:23:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-27 15:04:09 -0700 |
| commit | ed797074031a37bb9bf4a70952fffc606b77274d (patch) | |
| tree | f323ed49de53a520cd020827aef67b59dc1ccbaf | |
| parent | bae3f4c53585e9a170da9436e0f06919874bda9a (diff) | |
| download | blackbird-op-linux-ed797074031a37bb9bf4a70952fffc606b77274d.tar.gz blackbird-op-linux-ed797074031a37bb9bf4a70952fffc606b77274d.zip | |
USB: cdc-acm: fix shutdown and suspend race
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")
Cc: <stable@vger.kernel.org> # v2.6.27
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 2258827df084..1ac6c5dda9f7 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1550,8 +1550,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; } |
