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

Commit 9005355a authored by Jack Pham's avatar Jack Pham Committed by Sarah Sharp
Browse files

usb: xhci: Check for XHCI_PLAT in xhci_cleanup_msix() 



If CONFIG_PCI is enabled, make sure xhci_cleanup_msix()
doesn't try to free a bogus PCI IRQ or dereference an invalid
pci_dev when the xHCI device is actually a platform_device.

This patch should be backported to kernels as old as 3.9, that
contain the commit 52fb6125
"xhci-plat: Don't enable legacy PCI interrupts."

Signed-off-by: default avatarJack Pham <jackp@codeaurora.org>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@vger.kernel.org
parent 599459d8

drivers/usb/host/xhci.c

+3 −0
Original line number Diff line number Diff line
@@ -325,6 +325,9 @@ static void xhci_cleanup_msix(struct xhci_hcd *xhci) 
	struct usb_hcd *hcd = xhci_to_hcd(xhci);

	struct pci_dev *pdev = to_pci_dev(hcd->self.controller);



	if (xhci->quirks & XHCI_PLAT)

		return;



	xhci_free_irq(xhci);



	if (xhci->msix_entries) {