xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: legousbtower: refactor endpoint retrieval

Browse Source 
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.

Cc: Juergen Stuber <starblue@users.sourceforge.net>
Cc: legousb-devel@lists.sourceforge.net
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold
2017-03-17 11:35:41 +01:00
committed by Greg Kroah-Hartman
parent 2707ca16c2
commit 9b181166f1
1 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/usb/misc/legousbtower.c
View File

@@ -806,10 +806,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
struct device *idev = &interface->dev; struct device *idev = &interface->dev;
struct usb_device *udev = interface_to_usbdev(interface); struct usb_device *udev = interface_to_usbdev(interface);
struct lego_usb_tower *dev = NULL; struct lego_usb_tower *dev = NULL;
struct usb_host_interface *iface_desc;
struct usb_endpoint_descriptor* endpoint;
struct tower_get_version_reply get_version_reply; struct tower_get_version_reply get_version_reply;
int i;
int retval = -ENOMEM; int retval = -ENOMEM;
int result; int result;
@@ -846,25 +843,13 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
dev->interrupt_out_urb = NULL; dev->interrupt_out_urb = NULL;
dev->interrupt_out_busy = 0; dev->interrupt_out_busy = 0;
iface_desc = interface->cur_altsetting; result = usb_find_common_endpoints_reverse(interface->cur_altsetting,
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 (result) {
dev_err(idev, "interrupt endpoints not found\n");
if (usb_endpoint_xfer_int(endpoint)) { retval = result;
if (usb_endpoint_dir_in(endpoint))
dev->interrupt_in_endpoint = endpoint;
else
dev->interrupt_out_endpoint = endpoint;
}
}
if(dev->interrupt_in_endpoint == NULL) {
dev_err(idev, "interrupt in endpoint not found\n");
goto error;
}
if (dev->interrupt_out_endpoint == NULL) {
dev_err(idev, "interrupt out endpoint not found\n");
goto error; goto error;
} }