aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/input
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/input')
-rw-r--r--drivers/usb/input/hid-core.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 6d08a3bcc952..ebc9e823a46e 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -969,9 +969,10 @@ static void hid_retry_timeout(unsigned long _hid)
969} 969}
970 970
971/* Workqueue routine to reset the device */ 971/* Workqueue routine to reset the device */
972static void hid_reset(void *_hid) 972static void hid_reset(struct work_struct *work)
973{ 973{
974 struct hid_device *hid = (struct hid_device *) _hid; 974 struct hid_device *hid =
975 container_of(work, struct hid_device, reset_work);
975 int rc_lock, rc; 976 int rc_lock, rc;
976 977
977 dev_dbg(&hid->intf->dev, "resetting device\n"); 978 dev_dbg(&hid->intf->dev, "resetting device\n");
@@ -2015,7 +2016,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
2015 2016
2016 init_waitqueue_head(&hid->wait); 2017 init_waitqueue_head(&hid->wait);
2017 2018
2018 INIT_WORK(&hid->reset_work, hid_reset, hid); 2019 INIT_WORK(&hid->reset_work, hid_reset);
2019 setup_timer(&hid->io_retry, hid_retry_timeout, (unsigned long) hid); 2020 setup_timer(&hid->io_retry, hid_retry_timeout, (unsigned long) hid);
2020 2021
2021 spin_lock_init(&hid->inlock); 2022 spin_lock_init(&hid->inlock);