Thread (3 messages) flat view 3 messages, 2 authors, 2012-08-09
STALE5154d

[patch v2 1/1] HID:hid-multitouch: Add ELAN prouction request when resume

From: Scott Liu <hidden>
Date: 2012-08-09 09:21:42
Also in: lkml
Subsystem: hid core layer, the rest · Maintainers: Jiri Kosina, Benjamin Tissoires, Linus Torvalds

Some of ELAN's production need to with set_idle commmand when reusme.

Signed-off-by: Scott Liu <redacted>
---
 drivers/hid/hid-ids.h        |    3 +++
 drivers/hid/hid-multitouch.c |   20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 41c34f2..a4d810c 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -829,4 +829,7 @@
 #define USB_VENDOR_ID_PRIMAX	0x0461
 #define USB_DEVICE_ID_PRIMAX_KEYBOARD	0x4e05
 
+#define USB_VENDOR_ID_ELAN  0x04f3
+#define USB_DEVICE_ID_ELAN_MOCCA    0x000a
+
 #endif
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 59c8b5c..b06b7d3 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -767,6 +767,25 @@ static int mt_reset_resume(struct hid_device *hdev)
 	mt_set_input_mode(hdev);
 	return 0;
 }
+
+static int mt_resume(struct hid_device *hdev)
+{
+	if (hdev->vendor == USB_VENDOR_ID_ELAN &&
+		hdev->product == USB_DEVICE_ID_ELAN_MOCCA) {
+
+		struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
+		struct usb_host_interface *interface = intf->cur_altsetting;
+		struct usb_device *dev = hid_to_usb_dev(hdev);
+
+		usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+						HID_REQ_SET_IDLE, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
+						0, interface->desc.bInterfaceNumber,
+						NULL, 0, USB_CTRL_SET_TIMEOUT);
+    }
+
+    return 0;
+}
+
 #endif
 
 static void mt_remove(struct hid_device *hdev)
@@ -1092,6 +1111,7 @@ static struct hid_driver mt_driver = {
 	.event = mt_event,
 #ifdef CONFIG_PM
 	.reset_resume = mt_reset_resume,
+	.resume = mt_resume,
 #endif
 };
 
-- 
1.7.9.5
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help