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

Commit 5452eeb3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: xhci-msm-hsic: Define XHCI_PLAT quirk"

parents c3cec45f 991d7f58

drivers/usb/host/xhci-msm-hsic.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static void mxhci_hsic_plat_quirks(struct device *dev, struct xhci_hcd *xhci) 
	 * here that the generic code does not try to make a pci_dev from our

	 * dev struct in order to setup MSI

	 */

	xhci->quirks |= XHCI_BROKEN_MSI;

	xhci->quirks |= XHCI_PLAT;



	/* Single port controller using out of band remote wakeup */

	if (mxhci->wakeup_irq)

drivers/usb/host/xhci.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ int xhci_reset(struct xhci_hcd *xhci) 
	return ret;

}



#if defined(CONFIG_PCI) && !defined(CONFIG_ARCH_MSM)

#ifdef CONFIG_PCI

static int xhci_free_msi(struct xhci_hcd *xhci)

{

	int i;