Commit 9a7370be authored Sep 18, 2017 by Mathias Nyman Committed by Greg Kroah-Hartman Oct 12, 2017

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>

parent 0502bf54

drivers/usb/host/xhci.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1434,7 +1434,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;