aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hid/usbhid/hid-core.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index ac8049b5f1e..76c4bbe9dcc 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -1234,12 +1234,11 @@ static int hid_post_reset(struct usb_interface *intf)
1234 struct hid_device *hid = usb_get_intfdata(intf); 1234 struct hid_device *hid = usb_get_intfdata(intf);
1235 struct usbhid_device *usbhid = hid->driver_data; 1235 struct usbhid_device *usbhid = hid->driver_data;
1236 int status; 1236 int status;
1237 1237
1238 spin_lock_irq(&usbhid->lock); 1238 spin_lock_irq(&usbhid->lock);
1239 clear_bit(HID_RESET_PENDING, &usbhid->iofl); 1239 clear_bit(HID_RESET_PENDING, &usbhid->iofl);
1240 spin_unlock_irq(&usbhid->lock); 1240 spin_unlock_irq(&usbhid->lock);
1241 hid_set_idle(dev, intf->cur_altsetting->desc.bInterfaceNumber, 0, 0); 1241 hid_set_idle(dev, intf->cur_altsetting->desc.bInterfaceNumber, 0, 0);
1242 /* FIXME: Any more reinitialization needed? */
1243 status = hid_start_in(hid); 1242 status = hid_start_in(hid);
1244 if (status < 0) 1243 if (status < 0)
1245 hid_io_error(hid); 1244 hid_io_error(hid);
@@ -1251,14 +1250,14 @@ static int hid_post_reset(struct usb_interface *intf)
1251int usbhid_get_power(struct hid_device *hid) 1250int usbhid_get_power(struct hid_device *hid)
1252{ 1251{
1253 struct usbhid_device *usbhid = hid->driver_data; 1252 struct usbhid_device *usbhid = hid->driver_data;
1254 1253
1255 return usb_autopm_get_interface(usbhid->intf); 1254 return usb_autopm_get_interface(usbhid->intf);
1256} 1255}
1257 1256
1258void usbhid_put_power(struct hid_device *hid) 1257void usbhid_put_power(struct hid_device *hid)
1259{ 1258{
1260 struct usbhid_device *usbhid = hid->driver_data; 1259 struct usbhid_device *usbhid = hid->driver_data;
1261 1260
1262 usb_autopm_put_interface(usbhid->intf); 1261 usb_autopm_put_interface(usbhid->intf);
1263} 1262}
1264 1263