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

Commit 896e23bd authored by Olivier Sobrie's avatar Olivier Sobrie Committed by Marc Kleine-Budde
Browse files

can: kvaser_usb: fix usb endpoints detection 



Some devices, like the Kvaser Memorator Professional, have several bulk in
endpoints. Only the first one found must be used by the driver. The same holds
for the bulk out endpoint. The official Kvaser driver (leaf) was used as
reference for this patch.

Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarOlivier Sobrie <olivier@sobrie.be>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 5d0f801a

drivers/net/can/usb/kvaser_usb.c

+13 −7
Original line number Diff line number Diff line
@@ -1544,7 +1544,7 @@ static int kvaser_usb_init_one(struct usb_interface *intf, 
	return 0;

}



static void kvaser_usb_get_endpoints(const struct usb_interface *intf,

static int kvaser_usb_get_endpoints(const struct usb_interface *intf,

				    struct usb_endpoint_descriptor **in,

				    struct usb_endpoint_descriptor **out)

{
@@ -1557,12 +1557,18 @@ static void kvaser_usb_get_endpoints(const struct usb_interface *intf, 
	for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {

		endpoint = &iface_desc->endpoint[i].desc;



		if (usb_endpoint_is_bulk_in(endpoint))

		if (!*in && usb_endpoint_is_bulk_in(endpoint))

			*in = endpoint;



		if (usb_endpoint_is_bulk_out(endpoint))

		if (!*out && usb_endpoint_is_bulk_out(endpoint))

			*out = endpoint;



		/* use first bulk endpoint for in and out */

		if (*in && *out)

			return 0;

	}



	return -ENODEV;

}



static int kvaser_usb_probe(struct usb_interface *intf,
@@ -1576,8 +1582,8 @@ static int kvaser_usb_probe(struct usb_interface *intf, 
	if (!dev)

		return -ENOMEM;



	kvaser_usb_get_endpoints(intf, &dev->bulk_in, &dev->bulk_out);

	if (!dev->bulk_in || !dev->bulk_out) {

	err = kvaser_usb_get_endpoints(intf, &dev->bulk_in, &dev->bulk_out);

	if (err) {

		dev_err(&intf->dev, "Cannot get usb endpoint(s)");

		return err;

	}