]> git.karo-electronics.de Git - linux-beck.git/commitdiff
usb: serial: xsens_mt: always bind to interface number 1
authorFrans Klaver <frans.klaver@xsens.com>
Thu, 4 Sep 2014 07:25:37 +0000 (09:25 +0200)
committerJohan Hovold <johan@kernel.org>
Thu, 4 Sep 2014 09:18:26 +0000 (11:18 +0200)
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>
drivers/usb/serial/xsens_mt.c

index d500ccd57dd43a564d6acb89038785396863c12a..3837d5113bb21ed24f66bf5de79c0a6cb0c42fea 100644 (file)
@@ -41,28 +41,13 @@ static const struct usb_device_id 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,
                                        const struct usb_device_id *id)
 {
-       if (!has_required_endpoints(serial->interface->cur_altsetting))
-               return -ENODEV;
-       return 0;
+       if (serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)
+               return 0;
+
+       return -ENODEV;
 }
 
 static struct usb_serial_driver xsens_mt_device = {