Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adceac14 authored by Frans Klaver's avatar Frans Klaver Committed by Johan Hovold
Browse files

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



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: default avatarFrans Klaver <frans.klaver@xsens.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 7c133253

drivers/usb/serial/xsens_mt.c

+4 −19
Original line number Diff line number Diff line
@@ -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;

	if (serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)

		return 0;



	return -ENODEV;

}



static struct usb_serial_driver xsens_mt_device = {