From: Kevin Hao <[email protected]> When merging the stable commit dd125fcd580a ("Revert "xhci: add quirk for host controllers that don't update endpoint DCS""), the changes in it conflict with the SDK patches. The final merge resolution is incorrect. So fix the build errors caused by the merge: - Add the missing '{' for the if statement - Drop the code deleted by commit dd125fcd580a
Signed-off-by: Kevin Hao <[email protected]> --- Hi Bruce, Please help me merge this into the following three branches: v5.15/standard/bcm-2xxx-rpi v6.1/standard/bcm-2xxx-rpi v6.1/standard/preempt-rt/bcm-2xxx-rpi drivers/usb/host/xhci-pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 3106ea34dc6e..efcfd7a2a1ba 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -294,9 +294,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) pdev->device == 0x3432) xhci->quirks |= XHCI_BROKEN_STREAMS; - if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) + if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) { xhci->quirks |= XHCI_LPM_SUPPORT; - xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG; xhci->quirks |= XHCI_VLI_SS_BULK_OUT_BUG; -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12921): https://lists.yoctoproject.org/g/linux-yocto/message/12921 Mute This Topic: https://lists.yoctoproject.org/mt/100537901/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
