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: Johan Hovold <[email protected]> --- drivers/usb/misc/ldusb.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c index 3bc5356832db..7a94f95bdec6 100644 --- a/drivers/usb/misc/ldusb.c +++ b/drivers/usb/misc/ldusb.c @@ -650,9 +650,7 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id * struct usb_device *udev = interface_to_usbdev(intf); struct ld_usb *dev = NULL; struct usb_host_interface *iface_desc; - struct usb_endpoint_descriptor *endpoint; char *buffer; - int i; int retval = -ENOMEM; /* allocate memory for our device state and initialize it */ @@ -681,23 +679,20 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id * iface_desc = intf->cur_altsetting; - /* set up the endpoint information */ - for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { - endpoint = &iface_desc->endpoint[i].desc; - - 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) { + retval = usb_find_last_int_in_endpoint(iface_desc, + &dev->interrupt_in_endpoint); + if (retval) { dev_err(&intf->dev, "Interrupt in endpoint not found\n"); goto error; } - if (dev->interrupt_out_endpoint == NULL) + + retval = usb_find_last_int_out_endpoint(iface_desc, + &dev->interrupt_out_endpoint); + if (retval) dev_warn(&intf->dev, "Interrupt out endpoint not found (using control endpoint instead)\n"); + retval = -ENOMEM; + dev->interrupt_in_endpoint_size = usb_endpoint_maxp(dev->interrupt_in_endpoint); dev->ring_buffer = kmalloc(ring_buffer_size*(sizeof(size_t)+dev->interrupt_in_endpoint_size), GFP_KERNEL); if (!dev->ring_buffer) -- 2.12.0 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
