diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-21 09:27:15 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-21 09:27:15 +0300 |
| commit | c049ffb35ac4a393919a001f8f468c43cb185a34 (patch) | |
| tree | 3d8835848724bebf6326aaed3ae5e4dd8d302057 /drivers/usb/host | |
| parent | baf12d6ddeae74dfcfd5d19fce86260a2e1e44f2 (diff) | |
| parent | 771c577c23bac90597c685971d7297ea00f99d11 (diff) | |
| download | linux-c049ffb35ac4a393919a001f8f468c43cb185a34.tar.xz | |
Merge 4.17-rc6 into usb-next
We want the bug fixes and this resolves the merge issues with the usbip
driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/xhci-hub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index 72ebbc908e19..32cd52ca8318 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -354,7 +354,7 @@ int xhci_find_slot_id_by_port(struct usb_hcd *hcd, struct xhci_hcd *xhci, slot_id = 0; for (i = 0; i < MAX_HC_SLOTS; i++) { - if (!xhci->devs[i]) + if (!xhci->devs[i] || !xhci->devs[i]->udev) continue; speed = xhci->devs[i]->udev->speed; if (((speed >= USB_SPEED_SUPER) == (hcd->speed >= HCD_USB3)) |