diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 09:02:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 09:02:03 +0100 |
| commit | e880c3744b3189f50808c0825053a10394aff0de (patch) | |
| tree | b01781131b8067742791a576ec8ad8e192b96dd9 /drivers/usb/serial | |
| parent | usb: host: xhci-tegra: Implement basic ELPG support (diff) | |
| parent | Linux 5.5-rc2 (diff) | |
| download | linux-dev-e880c3744b3189f50808c0825053a10394aff0de.tar.xz linux-dev-e880c3744b3189f50808c0825053a10394aff0de.zip | |
Merge 5.5-rc2 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/io_edgeport.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index 48a439298a68..9690a5f4b9d6 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c @@ -2901,16 +2901,18 @@ static int edge_startup(struct usb_serial *serial) response = 0; if (edge_serial->is_epic) { + struct usb_host_interface *alt; + + alt = serial->interface->cur_altsetting; + /* EPIC thing, set up our interrupt polling now and our read * urb, so that the device knows it really is connected. */ interrupt_in_found = bulk_in_found = bulk_out_found = false; - for (i = 0; i < serial->interface->altsetting[0] - .desc.bNumEndpoints; ++i) { + for (i = 0; i < alt->desc.bNumEndpoints; ++i) { struct usb_endpoint_descriptor *endpoint; int buffer_size; - endpoint = &serial->interface->altsetting[0]. - endpoint[i].desc; + endpoint = &alt->endpoint[i].desc; buffer_size = usb_endpoint_maxp(endpoint); if (!interrupt_in_found && (usb_endpoint_is_int_in(endpoint))) { |