From aa69e17eb6b75d697a01e4ad3d3d57b80731061c Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Wed, 27 Feb 2013 16:38:18 +0100 Subject: [PATCH] --- yaml --- r: 366330 b: refs/heads/master c: 4ba25d3f87fe3ed6634f61da2a6904e2dfd09192 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-multitouch.c | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 269cadaec724..0227dd8d7e2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9684819b5a29e62acd8265a92d8f3454de9bb71e +refs/heads/master: 4ba25d3f87fe3ed6634f61da2a6904e2dfd09192 diff --git a/trunk/drivers/hid/hid-multitouch.c b/trunk/drivers/hid/hid-multitouch.c index 3af9efdd13d9..f712772437cb 100644 --- a/trunk/drivers/hid/hid-multitouch.c +++ b/trunk/drivers/hid/hid-multitouch.c @@ -909,26 +909,11 @@ static int mt_reset_resume(struct hid_device *hdev) static int mt_resume(struct hid_device *hdev) { - struct usb_interface *intf; - struct usb_host_interface *interface; - struct usb_device *dev; - - if (hdev->bus != BUS_USB) - return 0; - - intf = to_usb_interface(hdev->dev.parent); - interface = intf->cur_altsetting; - 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. * Tested on 3M, Stantum, Cypress, Zytronic, eGalax, and Elan panels. */ - 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); + hid_hw_idle(hdev, 0, 0, HID_REQ_SET_IDLE); return 0; }