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>
This commit is contained in:
Родитель
05ee283879
Коммит
ede6a8b239
|
@ -1367,16 +1367,6 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message)
|
||||||
return -EIO;
|
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_cancel_delayed_stuff(usbhid);
|
||||||
hid_cease_io(usbhid);
|
hid_cease_io(usbhid);
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,6 @@ struct usb_interface *usbhid_find_interface(int minor);
|
||||||
#define HID_STARTED 8
|
#define HID_STARTED 8
|
||||||
#define HID_REPORTED_IDLE 9
|
#define HID_REPORTED_IDLE 9
|
||||||
#define HID_KEYS_PRESSED 10
|
#define HID_KEYS_PRESSED 10
|
||||||
#define HID_LED_ON 11
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* USB-specific HID struct, to be pointed to
|
* USB-specific HID struct, to be pointed to
|
||||||
|
|
Загрузка…
Ссылка в новой задаче