Commit d7b11fe5 authored Nov 06, 2024 by Kuangyi Chiang Committed by Greg Kroah-Hartman Nov 06, 2024

xhci: Combine two if statements for Etron xHCI host



Combine two if statements, because these hosts have the same
quirk flags applied.

[Mathias: has stable tag because other fixes in series depend on this]

Fixes: 91f7a152 ("xhci: Apply broken streams quirk to Etron EJ188 xHCI host")
Cc: stable@vger.kernel.org
Signed-off-by: Kuangyi Chiang <ki.chiang65@gmail.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20241106101459.775897-18-mathias.nyman@linux.intel.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f53ce003

drivers/usb/host/xhci-pci.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -394,12 +394,8 @@ static void xhci_pci_quirks(struct device dev, struct xhci_hcd xhci)
		xhci->quirks \|= XHCI_DEFAULT_PM_RUNTIME_ALLOW;

		if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
		pdev->device == PCI_DEVICE_ID_EJ168) {
		xhci->quirks \|= XHCI_RESET_ON_RESUME;
		xhci->quirks \|= XHCI_BROKEN_STREAMS;
		}
		if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
		pdev->device == PCI_DEVICE_ID_EJ188) {
		(pdev->device == PCI_DEVICE_ID_EJ168 \|\|
		pdev->device == PCI_DEVICE_ID_EJ188)) {
		xhci->quirks \|= XHCI_RESET_ON_RESUME;
		xhci->quirks \|= XHCI_BROKEN_STREAMS;
		}