Commit 7d8825be authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: sierra: clean up suspend

Clean up suspend() somewhat and make sure to always set the suspended
flag (although it's only used for runtime PM) in order to match
resume().
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c80782e
...@@ -964,22 +964,18 @@ static void stop_read_write_urbs(struct usb_serial *serial) ...@@ -964,22 +964,18 @@ static void stop_read_write_urbs(struct usb_serial *serial)
static int sierra_suspend(struct usb_serial *serial, pm_message_t message) static int sierra_suspend(struct usb_serial *serial, pm_message_t message)
{ {
struct sierra_intf_private *intfdata; struct sierra_intf_private *intfdata = usb_get_serial_data(serial);
int b;
spin_lock_irq(&intfdata->susp_lock);
if (PMSG_IS_AUTO(message)) { if (PMSG_IS_AUTO(message)) {
intfdata = usb_get_serial_data(serial); if (intfdata->in_flight) {
spin_lock_irq(&intfdata->susp_lock);
b = intfdata->in_flight;
if (b) {
spin_unlock_irq(&intfdata->susp_lock); spin_unlock_irq(&intfdata->susp_lock);
return -EBUSY; return -EBUSY;
} else {
intfdata->suspended = 1;
spin_unlock_irq(&intfdata->susp_lock);
} }
} }
intfdata->suspended = 1;
spin_unlock_irq(&intfdata->susp_lock);
stop_read_write_urbs(serial); stop_read_write_urbs(serial);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment