[PATCH 1/4] usb: host: xhci: Move the xhci quirks checking to the right place

From: Baolin Wang
Date: Fri Jul 15 2016 - 05:14:38 EST


It will reset the xhci quirks in xhci_gen_setup() function when xhci try to
add one hcd, thus we need to move the XHCI_LPM_SUPPORT quirk checking after
adding hcd.

Signed-off-by: Baolin Wang <baolin.wang@xxxxxxxxxx>
---
drivers/usb/host/xhci-plat.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 1f3f981..e2e2487 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -223,10 +223,6 @@ static int xhci_plat_probe(struct platform_device *pdev)
goto disable_clk;
}

- if ((node && of_property_read_bool(node, "usb3-lpm-capable")) ||
- (pdata && pdata->usb3_lpm_capable))
- xhci->quirks |= XHCI_LPM_SUPPORT;
-
if (HCC_MAX_PSA(xhci->hcc_params) >= 4)
xhci->shared_hcd->can_do_streams = 1;

@@ -250,6 +246,10 @@ static int xhci_plat_probe(struct platform_device *pdev)
if (ret)
goto dealloc_usb2_hcd;

+ if ((node && of_property_read_bool(node, "usb3-lpm-capable")) ||
+ (pdata && pdata->usb3_lpm_capable))
+ xhci->quirks |= XHCI_LPM_SUPPORT;
+
return 0;


--
1.7.9.5