| Message ID | 1344390033-14139-1-git-send-email-scott.liu@emc.com.tw (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Jiri Kosina |
| Headers | show |
Hi Scott, There is a few white space problems and a maybe an oops. Sorry for not having seen this before. On Wed, Aug 8, 2012 at 3:40 AM, Scott Liu <scott.liu@emc.com.tw> wrote: > Some of ELAN’s production need to issue set_idle when resume. > > Signed-off-by: Scott Liu <scott.liu@emc.com.tw> > --- > drivers/hid/hid-ids.h | 3 +++ > drivers/hid/hid-multitouch.c | 26 ++++++++++++++++++++++++++ > 2 files changed, 29 insertions(+) > > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > index 41c34f2..703aaed 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..a086a16 100644 > --- a/drivers/hid/hid-multitouch.c > +++ b/drivers/hid/hid-multitouch.c > @@ -767,6 +767,31 @@ static int mt_reset_resume(struct hid_device *hdev) > mt_set_input_mode(hdev); > return 0; > } > + > +static int mt_resume(struct hid_device *hdev) > +{ > + struct usb_interface *intf = to_usb_interface(hdev->dev.parent); > + struct usb_host_interface *interface = intf->cur_altsetting; There is at least one bluetooth multitouch device, so maybe intf will be null.... > + > + struct usb_device *dev = hid_to_usb_dev(hdev); > + > + if (hdev->vendor == USB_VENDOR_ID_ELAN && > + hdev->product == USB_DEVICE_ID_ELAN_MOCCA) { moving this test at the beginning will prevent us from null or random pointers. > + > + usb_control_msg(dev, > + usb_sndctrlpipe(dev, 0), > + HID_REQ_SET_IDLE, mix tab/spaces.... > + USB_TYPE_CLASS | USB_RECIP_INTERFACE, > + 0, > + interface->desc.bInterfaceNumber, again.... > + NULL, > + 0, > + USB_CTRL_SET_TIMEOUT); > + } > + > + return 0; > +} > + > #endif > > static void mt_remove(struct hid_device *hdev) > @@ -1092,6 +1117,7 @@ static struct hid_driver mt_driver = { > .event = mt_event, > #ifdef CONFIG_PM > .reset_resume = mt_reset_resume, > + .resume=mt_resume, spaces are need before and after the equal sign.... Cheers, Benjamin > #endif > }; > > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 41c34f2..703aaed 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..a086a16 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -767,6 +767,31 @@ static int mt_reset_resume(struct hid_device *hdev) mt_set_input_mode(hdev); return 0; } + +static int mt_resume(struct hid_device *hdev) +{ + 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); + + if (hdev->vendor == USB_VENDOR_ID_ELAN && + hdev->product == USB_DEVICE_ID_ELAN_MOCCA) { + + 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 +1117,7 @@ static struct hid_driver mt_driver = { .event = mt_event, #ifdef CONFIG_PM .reset_resume = mt_reset_resume, + .resume=mt_resume, #endif };
Some of ELAN’s production need to issue set_idle when resume. Signed-off-by: Scott Liu <scott.liu@emc.com.tw> --- drivers/hid/hid-ids.h | 3 +++ drivers/hid/hid-multitouch.c | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+)