Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[~andy/linux] / drivers / hid / usbhid / hid-core.c

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index effcd3d6f5cf6ebf0f638e93b20448edaeb5bc34..99418285222cf118cbc09e4d9029c80ba3493fcf 100644 (file)
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -1520,7 +1520,7 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message)
 {
        struct hid_device *hid = usb_get_intfdata(intf);
        struct usbhid_device *usbhid = hid->driver_data;
-       int status;
+       int status = 0;
        bool driver_suspended = false;
 
        if (PMSG_IS_AUTO(message)) {
@@ -1547,19 +1547,15 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message)
                }
 
        } else {
-               if (hid->driver && hid->driver->suspend) {
+               /* TODO: resume() might need to handle suspend failure */
+               if (hid->driver && hid->driver->suspend)
                        status = hid->driver->suspend(hid, message);
-                       if (status < 0)
-                               return status;
-               }
                driver_suspended = true;
                spin_lock_irq(&usbhid->lock);
                set_bit(HID_SUSPENDED, &usbhid->iofl);
                spin_unlock_irq(&usbhid->lock);
-               if (usbhid_wait_io(hid) < 0) {
+               if (usbhid_wait_io(hid) < 0)
                        status = -EIO;
-                       goto failed;
-               }
        }
 
        hid_cancel_delayed_stuff(usbhid);
@@ -1571,7 +1567,7 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message)
                goto failed;
        }
        dev_dbg(&intf->dev, "suspend\n");
-       return 0;
+       return status;
 
  failed:
        hid_resume_common(hid, driver_suspended);