Skip to content

Commit

Permalink
HID: usbhid: remove LED_ON
Browse files Browse the repository at this point in the history
LED_ON was defined in the original version of the hid-core autosuspend patch.
However, during review, the setting and clearing of it was redone
using ledcount.  The test was left in accidentally.

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Acked-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Daniel Kurtz authored and Jiri Kosina committed Dec 21, 2011
1 parent 05ee283 commit ede6a8b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
10 changes: 0 additions & 10 deletions drivers/hid/usbhid/hid-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1367,16 +1367,6 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message)
return -EIO;
}

if (!ignoreled && PMSG_IS_AUTO(message)) {
spin_lock_irq(&usbhid->lock);
if (test_bit(HID_LED_ON, &usbhid->iofl)) {
spin_unlock_irq(&usbhid->lock);
usbhid_mark_busy(usbhid);
return -EBUSY;
}
spin_unlock_irq(&usbhid->lock);
}

hid_cancel_delayed_stuff(usbhid);
hid_cease_io(usbhid);

Expand Down
1 change: 0 additions & 1 deletion drivers/hid/usbhid/usbhid.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ struct usb_interface *usbhid_find_interface(int minor);
#define HID_STARTED 8
#define HID_REPORTED_IDLE 9
#define HID_KEYS_PRESSED 10
#define HID_LED_ON 11

/*
* USB-specific HID struct, to be pointed to
Expand Down

0 comments on commit ede6a8b

Please sign in to comment.