From: Mathias Nyman Date: Mon, 18 Sep 2017 14:39:13 +0000 (+0300) Subject: xhci: fix finding correct bus_state structure for USB 3.1 hosts X-Git-Tag: archive/raspbian/4.9.80-2+rpi1~7^2~1758 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=67e752e1d60f9f40b8391dad48f7c842bdba6ec4;p=linux-4.9.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index a0f4a9feb058..5b137ec5891a 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;