aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorDaniel Kurtz <djkurtz@chromium.org>2011-11-17 06:23:48 -0500
committerJiri Kosina <jkosina@suse.cz>2011-12-21 05:18:35 -0500
commitede6a8b239736acd55ad8a219b2bd2ae7f551fb7 (patch)
treef04d43aee9b920b9cca5a242527f41f7c22c05b2 /drivers/hid
parent05ee28387946ca9936956a6e45f822c0c41dfc87 (diff)
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>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/usbhid/hid-core.c10
-rw-r--r--drivers/hid/usbhid/usbhid.h1
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index b403fcef0b86..66061349be87 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)
1367 return -EIO; 1367 return -EIO;
1368 } 1368 }
1369 1369
1370 if (!ignoreled && PMSG_IS_AUTO(message)) {
1371 spin_lock_irq(&usbhid->lock);
1372 if (test_bit(HID_LED_ON, &usbhid->iofl)) {
1373 spin_unlock_irq(&usbhid->lock);
1374 usbhid_mark_busy(usbhid);
1375 return -EBUSY;
1376 }
1377 spin_unlock_irq(&usbhid->lock);
1378 }
1379
1380 hid_cancel_delayed_stuff(usbhid); 1370 hid_cancel_delayed_stuff(usbhid);
1381 hid_cease_io(usbhid); 1371 hid_cease_io(usbhid);
1382 1372
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h
index 1673cac93d77..2d8957c11d2d 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);
55#define HID_STARTED 8 55#define HID_STARTED 8
56#define HID_REPORTED_IDLE 9 56#define HID_REPORTED_IDLE 9
57#define HID_KEYS_PRESSED 10 57#define HID_KEYS_PRESSED 10
58#define HID_LED_ON 11
59 58
60/* 59/*
61 * USB-specific HID struct, to be pointed to 60 * USB-specific HID struct, to be pointed to