Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 366330
b: refs/heads/master
c: 4ba25d3
h: refs/heads/master
v: v3
  • Loading branch information
Benjamin Tissoires authored and Jiri Kosina committed Mar 7, 2013
1 parent fd6f243 commit aa69e17
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9684819b5a29e62acd8265a92d8f3454de9bb71e
refs/heads/master: 4ba25d3f87fe3ed6634f61da2a6904e2dfd09192
17 changes: 1 addition & 16 deletions trunk/drivers/hid/hid-multitouch.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit aa69e17

Please sign in to comment.