Commit e53e0342 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: adutux: refactor endpoint retrieval

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

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 e0e90520
...@@ -655,12 +655,10 @@ static int adu_probe(struct usb_interface *interface, ...@@ -655,12 +655,10 @@ static int adu_probe(struct usb_interface *interface,
{ {
struct usb_device *udev = interface_to_usbdev(interface); struct usb_device *udev = interface_to_usbdev(interface);
struct adu_device *dev = NULL; struct adu_device *dev = NULL;
struct usb_host_interface *iface_desc;
struct usb_endpoint_descriptor *endpoint;
int retval = -ENOMEM; int retval = -ENOMEM;
int in_end_size; int in_end_size;
int out_end_size; int out_end_size;
int i; int res;
/* allocate memory for our device state and initialize it */ /* allocate memory for our device state and initialize it */
dev = kzalloc(sizeof(struct adu_device), GFP_KERNEL); dev = kzalloc(sizeof(struct adu_device), GFP_KERNEL);
...@@ -673,26 +671,13 @@ static int adu_probe(struct usb_interface *interface, ...@@ -673,26 +671,13 @@ static int adu_probe(struct usb_interface *interface,
init_waitqueue_head(&dev->read_wait); init_waitqueue_head(&dev->read_wait);
init_waitqueue_head(&dev->write_wait); init_waitqueue_head(&dev->write_wait);
iface_desc = &interface->altsetting[0]; res = usb_find_common_endpoints_reverse(&interface->altsetting[0],
NULL, NULL,
/* set up the endpoint information */ &dev->interrupt_in_endpoint,
for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { &dev->interrupt_out_endpoint);
endpoint = &iface_desc->endpoint[i].desc; if (res) {
dev_err(&interface->dev, "interrupt endpoints not found\n");
if (usb_endpoint_is_int_in(endpoint)) retval = res;
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(&interface->dev, "interrupt in endpoint not found\n");
retval = -ENODEV;
goto error;
}
if (dev->interrupt_out_endpoint == NULL) {
dev_err(&interface->dev, "interrupt out endpoint not found\n");
retval = -ENODEV;
goto error; goto error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment