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: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 4b6d0ff..1d42e83 100644 (file)
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -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)
 {
-       struct sierra_intf_private *intfdata;
-       int b;
+       struct sierra_intf_private *intfdata = usb_get_serial_data(serial);
 
+       spin_lock_irq(&intfdata->susp_lock);
        if (PMSG_IS_AUTO(message)) {
-               intfdata = usb_get_serial_data(serial);
-               spin_lock_irq(&intfdata->susp_lock);
-               b = intfdata->in_flight;
-
-               if (b) {
+               if (intfdata->in_flight) {
                        spin_unlock_irq(&intfdata->susp_lock);
                        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);
 
        return 0;