leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: sierra: clean up suspend

Browse Source 
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: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2014-05-26 19:23:06 +02:00 committed by Greg Kroah-Hartman
parent 7c80782ebf
commit 7d8825bed4
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/usb/serial/sierra.c
View File

@ -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;