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

Commit 2707ca16 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: ldusb: refactor endpoint retrieval 



Use the new endpoint helpers to lookup the required interrupt-in
endpoint and optional interrupt-out endpoint.

Note that the descriptors are searched in reverse order to avoid any
regressions.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 920df8d7

drivers/usb/misc/ldusb.c

+9 −14
Original line number Original line Diff line number Diff line
@@ -650,10 +650,9 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id * 
	struct usb_device *udev = interface_to_usbdev(intf);

	struct usb_device *udev = interface_to_usbdev(intf);

	struct ld_usb *dev = NULL;

	struct ld_usb *dev = NULL;

	struct usb_host_interface *iface_desc;

	struct usb_host_interface *iface_desc;

	struct usb_endpoint_descriptor *endpoint;

	char *buffer;

	char *buffer;

	int i;

	int retval = -ENOMEM;

	int retval = -ENOMEM;

	int res;





	/* allocate memory for our device state and initialize it */

	/* allocate memory for our device state and initialize it */
@@ -681,21 +680,17 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id * 




	iface_desc = intf->cur_altsetting;

	iface_desc = intf->cur_altsetting;





	/* set up the endpoint information */

	res = usb_find_last_int_in_endpoint(iface_desc,

	for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {

			&dev->interrupt_in_endpoint);

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

	if (res) {



		if (usb_endpoint_is_int_in(endpoint))

			dev->interrupt_in_endpoint = endpoint;



		if (usb_endpoint_is_int_out(endpoint))

			dev->interrupt_out_endpoint = endpoint;

	}

	if (dev->interrupt_in_endpoint == NULL) {

		dev_err(&intf->dev, "Interrupt in endpoint not found\n");

		dev_err(&intf->dev, "Interrupt in endpoint not found\n");

		retval = res;

		goto error;

		goto error;

	}

	}

	if (dev->interrupt_out_endpoint == NULL)



	res = usb_find_last_int_out_endpoint(iface_desc,

			&dev->interrupt_out_endpoint);

	if (res)

		dev_warn(&intf->dev, "Interrupt out endpoint not found (using control endpoint instead)\n");

		dev_warn(&intf->dev, "Interrupt out endpoint not found (using control endpoint instead)\n");





	dev->interrupt_in_endpoint_size = usb_endpoint_maxp(dev->interrupt_in_endpoint);

	dev->interrupt_in_endpoint_size = usb_endpoint_maxp(dev->interrupt_in_endpoint);