summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Nyman <mathias.nyman@linux.intel.com>2017-09-18 17:39:13 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-09-18 17:10:41 +0200
commit5a838a13c9b4e5dd188b7a6eaeb894e9358ead0c (patch)
tree31917e8136c040a51ed8ee1bea687af57d0d3e9e
parent9821786d7c90eee2f6852261893d9703801aae47 (diff)
downloadop-kernel-dev-5a838a13c9b4e5dd188b7a6eaeb894e9358ead0c.zip
op-kernel-dev-5a838a13c9b4e5dd188b7a6eaeb894e9358ead0c.tar.gz
xhci: fix finding correct bus_state structure for USB 3.1 hosts
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. Cc: <stable@vger.kernel.org> 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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 2abaa4d..e96e90d 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1681,7 +1681,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;
OpenPOWER on IntegriCloud