leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: serial: xsens_mt: always bind to interface number 1

Browse Source 
Probe is testing if the current interface provides two bulk endpoints.
While this achieves the goal of only binding to the correct interface,
we already know we can find the device on interface number 1. Stop
checking the endpoints and just return successfully when interface
number 1 is probed.

Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Frans Klaver 2014-09-04 09:25:37 +02:00 committed by Johan Hovold
parent 7c13325380
commit adceac1416
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/usb/serial/xsens_mt.c
View File

@ -41,28 +41,13 @@ static const struct usb_device_id id_table[] = {
}; };
MODULE_DEVICE_TABLE(usb, id_table); MODULE_DEVICE_TABLE(usb, id_table);
static int has_required_endpoints(const struct usb_host_interface *interface)
{
__u8 i;
int has_bulk_in = 0;
int has_bulk_out = 0;
for (i = 0; i < interface->desc.bNumEndpoints; ++i) {
if (usb_endpoint_is_bulk_in(&interface->endpoint[i].desc))
has_bulk_in = 1;
else if (usb_endpoint_is_bulk_out(&interface->endpoint[i].desc))
has_bulk_out = 1;
}
return has_bulk_in && has_bulk_out;
}
static int xsens_mt_probe(struct usb_serial *serial, static int xsens_mt_probe(struct usb_serial *serial,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
if (!has_required_endpoints(serial->interface->cur_altsetting)) if (serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)
return -ENODEV; return 0;
return 0;
return -ENODEV;
} }
static struct usb_serial_driver xsens_mt_device = { static struct usb_serial_driver xsens_mt_device = {