usbtouchscreen: find input endpoint automatically
Subsystems (2)
PATCH 3/7 usbtouchscreen: find input endpoint automatically
From: Ondrej Zary <[email protected]>
Find input enpoint automatically instead of assuming that the first one is OK. This is needed for devices with multiple endpoints such as iNexio where the first endpoint might be output.
Signed-off-by Ondrej Zary <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Jim Persson <[email protected]>
Cc Florian Echtler <[email protected]>
Cc Dan Streetman <[email protected]>
Cc Daniel Ritz <[email protected]>
Cc Greg KH <[email protected]>
Cc Oliver Neukum <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/input/touchscreen/usbtouchscreen.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/input/touchscreen/usbtouchscreen.c renamed from drivers/input/touchscreen/usbtouchscreen.c~usbtouchscreen-find-input-endpoint-automatically +10 -2
@@ -1057,17 +1057,25 @@ static int usbtouch_probe(struct usb_intstruct usbtouch_usb *usbtouch;struct input_dev *input_dev;struct usb_host_interface *interface; -struct usb_endpoint_descriptor *endpoint; +struct usb_endpoint_descriptor *endpoint =NULL ;struct usb_device *udev =interface_to_usbdev (intf);struct usbtouch_device_info *type;int err = -ENOMEM ; +int i;/* some devices are ignored */ if (id->driver_info ==DEVTYPE_IGNORE )return -ENODEV ; interface = intf->cur_altsetting; - endpoint = &interface->endpoint[0 ].desc; +/* find first input endpoint */ +for (i =0 ; i < interface->desc.bNumEndpoints; i++) +if (usb_endpoint_dir_in (&interface->endpoint[i].desc)) { + endpoint = &interface->endpoint[i].desc; +break ; + } +if (!endpoint) +return -ENXIO ; usbtouch =kzalloc (sizeof (struct usbtouch_usb ),GFP_KERNEL ); input_dev =input_allocate_device ();
_