From: Johan Hovold Date: Mon, 26 May 2014 17:23:40 +0000 (+0200) Subject: USB: cdc-acm: fix shutdown and suspend race X-Git-Tag: v3.4.95~13 X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=181614f0f226983c59be4f6e11eecd333bfd933b;p=unionfs-2.6.18.y.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index c7ee5a90829..f2f8287b07d 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1477,8 +1477,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; }