Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1f6d9a8 authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: don't dereference a xhci member after removing xhci 



Remove the hcd after checking for the xhci last quirks, not before.

This caused a hang on a Alpine Ridge xhci based maching which remove
the whole xhci controller when unplugging the last usb device

CC: <stable@vger.kernel.org>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88716a93

drivers/usb/host/xhci-pci.c

+2 −1
Original line number Diff line number Diff line
@@ -314,11 +314,12 @@ static void xhci_pci_remove(struct pci_dev *dev) 
		usb_remove_hcd(xhci->shared_hcd);

		usb_put_hcd(xhci->shared_hcd);

	}

	usb_hcd_pci_remove(dev);



	/* Workaround for spurious wakeups at shutdown with HSW */

	if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)

		pci_set_power_state(dev, PCI_D3hot);



	usb_hcd_pci_remove(dev);

}



#ifdef CONFIG_PM