usb: chipidea: Fix Internal error: : 808 [#1] ARM related to STS flag

[firefly-linux-kernel-4.4.55.git] / drivers / usb / chipidea / core.c

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 0ead0b4a11e16b5d3052667e7084fa885d74f09f..edeec363868497cfa4b06ca4bcf2edf0ac9df972 100644 (file)
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -236,7 +236,7 @@ static int hw_device_init(struct ci_hdrc *ci, void __iomem *base)
 
 static void hw_phymode_configure(struct ci_hdrc *ci)
 {
-       u32 portsc, lpm, sts;
+       u32 portsc, lpm, sts = 0;
 
        switch (ci->platdata->phy_mode) {
        case USBPHY_INTERFACE_MODE_UTMI:
@@ -266,10 +266,12 @@ static void hw_phymode_configure(struct ci_hdrc *ci)
 
        if (ci->hw_bank.lpm) {
                hw_write(ci, OP_DEVLC, DEVLC_PTS(7) | DEVLC_PTW, lpm);
-               hw_write(ci, OP_DEVLC, DEVLC_STS, sts);
+               if (sts)
+                       hw_write(ci, OP_DEVLC, DEVLC_STS, DEVLC_STS);
        } else {
                hw_write(ci, OP_PORTSC, PORTSC_PTS(7) | PORTSC_PTW, portsc);
-               hw_write(ci, OP_PORTSC, PORTSC_STS, sts);
+               if (sts)
+                       hw_write(ci, OP_PORTSC, PORTSC_STS, PORTSC_STS);
        }
 }