diff options
author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2013-02-25 05:31:48 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-02-25 07:26:41 -0500 |
commit | 4ebc9b636cdc340196138f35ca0788b8da0e1779 (patch) | |
tree | 9b39fa8fc704141da3eb9e9af659f7634d1eb66e /drivers/hid/hid-multitouch.c | |
parent | b7966a4d7be0a10329f03330390f4bdaf453d74a (diff) |
HID: multitouch: remove explicit usbhid dependency
This patch is part of the cleanup of the HID drivers
against their low-level transport layer.
With new touchscreens relying on I2C, it's better to
handle now these dependencies before users get kernel oopses.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-multitouch.c')
-rw-r--r-- | drivers/hid/hid-multitouch.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 32258ba60056..184ac0a42121 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
33 | #include <linux/usb.h> | 33 | #include <linux/usb.h> |
34 | #include <linux/input/mt.h> | 34 | #include <linux/input/mt.h> |
35 | #include "usbhid/usbhid.h" | ||
36 | 35 | ||
37 | 36 | ||
38 | MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>"); | 37 | MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>"); |
@@ -907,7 +906,7 @@ static int mt_resume(struct hid_device *hdev) | |||
907 | 906 | ||
908 | intf = to_usb_interface(hdev->dev.parent); | 907 | intf = to_usb_interface(hdev->dev.parent); |
909 | interface = intf->cur_altsetting; | 908 | interface = intf->cur_altsetting; |
910 | dev = hid_to_usb_dev(hdev); | 909 | dev = interface_to_usbdev(intf); |
911 | 910 | ||
912 | /* Some Elan legacy devices require SET_IDLE to be set on resume. | 911 | /* Some Elan legacy devices require SET_IDLE to be set on resume. |
913 | * It should be safe to send it to other devices too. | 912 | * It should be safe to send it to other devices too. |