diff options
| author | Daniel Kurtz <djkurtz@chromium.org> | 2011-11-17 19:23:48 +0800 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-12-21 11:18:35 +0100 |
| commit | ede6a8b239736acd55ad8a219b2bd2ae7f551fb7 (patch) | |
| tree | f04d43aee9b920b9cca5a242527f41f7c22c05b2 | |
| parent | 05ee28387946ca9936956a6e45f822c0c41dfc87 (diff) | |
| download | linux-3.10-ede6a8b239736acd55ad8a219b2bd2ae7f551fb7.tar.gz linux-3.10-ede6a8b239736acd55ad8a219b2bd2ae7f551fb7.tar.bz2 linux-3.10-ede6a8b239736acd55ad8a219b2bd2ae7f551fb7.zip | |
HID: usbhid: remove LED_ON
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>
| -rw-r--r-- | drivers/hid/usbhid/hid-core.c | 10 | ||||
| -rw-r--r-- | drivers/hid/usbhid/usbhid.h | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index b403fcef0b8..66061349be8 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -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); diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h index 1673cac93d7..2d8957c11d2 100644 --- a/drivers/hid/usbhid/usbhid.h +++ b/drivers/hid/usbhid/usbhid.h @@ -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 |