summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@gmail.com>2013-02-25 11:31:48 +0100
committerJiri Kosina <jkosina@suse.cz>2013-02-25 13:26:41 +0100
commit4ebc9b636cdc340196138f35ca0788b8da0e1779 (patch)
tree9b39fa8fc704141da3eb9e9af659f7634d1eb66e
parentb7966a4d7be0a10329f03330390f4bdaf453d74a (diff)
downloadlinux-4ebc9b636cdc340196138f35ca0788b8da0e1779.tar.bz2
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>
-rw-r--r--drivers/hid/hid-multitouch.c3
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 @@
#include <linux/slab.h>
#include <linux/usb.h>
#include <linux/input/mt.h>
-#include "usbhid/usbhid.h"
MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>");
@@ -907,7 +906,7 @@ static int mt_resume(struct hid_device *hdev)
intf = to_usb_interface(hdev->dev.parent);
interface = intf->cur_altsetting;
- dev = hid_to_usb_dev(hdev);
+ dev = interface_to_usbdev(intf);
/* Some Elan legacy devices require SET_IDLE to be set on resume.
* It should be safe to send it to other devices too.