Merge branch 'fix/hda' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / hid / usbhid / hid-core.c

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 03cb494af1c55e3531fe169e99bc7a9daa5e9ccd..f0a0f72238aba24c66c8ecaab0ca917064609add 100644 (file)
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -102,7 +102,7 @@ static void hid_reset(struct work_struct *work)
        struct usbhid_device *usbhid =
                container_of(work, struct usbhid_device, reset_work);
        struct hid_device *hid = usbhid->hid;
-       int rc_lock, rc = 0;
+       int rc = 0;
 
        if (test_bit(HID_CLEAR_HALT, &usbhid->iofl)) {
                dev_dbg(&usbhid->intf->dev, "clear halt\n");
@@ -113,11 +113,10 @@ static void hid_reset(struct work_struct *work)
 
        else if (test_bit(HID_RESET_PENDING, &usbhid->iofl)) {
                dev_dbg(&usbhid->intf->dev, "resetting device\n");
-               rc = rc_lock = usb_lock_device_for_reset(hid_to_usb_dev(hid), usbhid->intf);
-               if (rc_lock >= 0) {
+               rc = usb_lock_device_for_reset(hid_to_usb_dev(hid), usbhid->intf);
+               if (rc == 0) {
                        rc = usb_reset_device(hid_to_usb_dev(hid));
-                       if (rc_lock)
-                               usb_unlock_device(hid_to_usb_dev(hid));
+                       usb_unlock_device(hid_to_usb_dev(hid));
                }
                clear_bit(HID_RESET_PENDING, &usbhid->iofl);
        }