diff options
| author | Mathias Nyman <mathias.nyman@linux.intel.com> | 2017-09-18 14:39:13 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-12 09:51:17 (GMT) |
| commit | 67e752e1d60f9f40b8391dad48f7c842bdba6ec4 (patch) | |
| tree | 55c99548724cc535b0e2dc1ff005c5804d7aced3 | |
| parent | a6d4ce2e8b653ff7facde0d0051663fa4cf57b78 (diff) | |
| download | linux-67e752e1d60f9f40b8391dad48f7c842bdba6ec4.tar.xz | |
xhci: fix finding correct bus_state structure for USB 3.1 hosts
commit 5a838a13c9b4e5dd188b7a6eaeb894e9358ead0c upstream.
xhci driver keeps a bus_state structure for each hcd (usb2 and usb3)
The structure is picked based on hcd speed, but driver only compared
for HCD_USB3 speed, returning the wrong bus_state for HCD_USB31 hosts.
This caused null pointer dereference errors in bus_resume function.
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/host/xhci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index a0f4a9f..5b137ec 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1509,7 +1509,7 @@ struct xhci_bus_state { static inline unsigned int hcd_index(struct usb_hcd *hcd) { - if (hcd->speed == HCD_USB3) + if (hcd->speed >= HCD_USB3) return 0; else return 1; |