Use the new endpoint helpers to lookup the required interrupt-in and
interrupt-out endpoints.
Also make sure to return -ENOMEM on all allocation failures and -EIO on
a string-retrieval error (instead of returning -ENODEV for these errors).
Note that the descriptors are searched in reverse order to avoid any
regressions.
Signed-off-by: Johan Hovold <jo...@kernel.org>
---
drivers/usb/misc/adutux.c | 38 +++++++++++---------------------------
1 file changed, 11 insertions(+), 27 deletions(-)
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index db9a9e6ff6be..42f5f94adf3c 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -655,12 +655,9 @@ static int adu_probe(struct usb_interface *interface,
{
struct usb_device *udev = interface_to_usbdev(interface);
struct adu_device *dev = NULL;
- struct usb_host_interface *iface_desc;
- struct usb_endpoint_descriptor *endpoint;
int retval = -ENODEV;
int in_end_size;
int out_end_size;
- int i;
if (udev == NULL) {
dev_err(&interface->dev, "udev is NULL.\n");
@@ -680,35 +677,23 @@ static int adu_probe(struct usb_interface *interface,
init_waitqueue_head(&dev->read_wait);
init_waitqueue_head(&dev->write_wait);
- iface_desc = &interface->altsetting[0];
-
- /* 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) {
- dev_err(&interface->dev, "interrupt in endpoint not found\n");
- goto error;
- }
- if (dev->interrupt_out_endpoint == NULL) {
- dev_err(&interface->dev, "interrupt out endpoint not found\n");
+ retval = usb_find_common_endpoints_reverse(&interface->altsetting[0],
+ NULL, NULL,
+ &dev->interrupt_in_endpoint,
+ &dev->interrupt_out_endpoint);
+ if (retval) {
+ dev_err(&interface->dev, "interrupt endpoints not found\n");
goto error;
}
in_end_size = usb_endpoint_maxp(dev->interrupt_in_endpoint);
out_end_size = usb_endpoint_maxp(dev->interrupt_out_endpoint);
+ retval = -ENOMEM;
+
dev->read_buffer_primary = kmalloc((4 * in_end_size), GFP_KERNEL);
- if (!dev->read_buffer_primary) {
- retval = -ENOMEM;
+ if (!dev->read_buffer_primary)
goto error;
- }
/* debug code prime the buffer */
memset(dev->read_buffer_primary, 'a', in_end_size);
@@ -717,10 +702,8 @@ static int adu_probe(struct usb_interface *interface,
memset(dev->read_buffer_primary + (3 * in_end_size), 'd', in_end_size);
dev->read_buffer_secondary = kmalloc((4 * in_end_size), GFP_KERNEL);
- if (!dev->read_buffer_secondary) {
- retval = -ENOMEM;
+ if (!dev->read_buffer_secondary)
goto error;
- }
/* debug code prime the buffer */
memset(dev->read_buffer_secondary, 'e', in_end_size);
@@ -748,6 +731,7 @@ static int adu_probe(struct usb_interface *interface,
if (!usb_string(udev, udev->descriptor.iSerialNumber,
dev->serial_number,
sizeof(dev->serial_number))) {
dev_err(&interface->dev, "Could not retrieve serial number\n");
+ retval = -EIO;
goto error;
}
dev_dbg(&interface->dev,"serial_number=%s", dev->serial_number);
--
2.12.0
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
