]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ENGR00211329-1 Fix system dump of unhandled usb irq
authorTony LIU <junjie.liu@freescale.com>
Fri, 1 Jun 2012 09:55:17 +0000 (17:55 +0800)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 24 May 2013 06:34:45 +0000 (08:34 +0200)
Revert "ENGR00211686 mx6 usb: system crash after suspend/resume"

This reverts commit eb0fdddfc19ec5597f5973499765a5a8f5e75749.

Signed-off-by: Tony LIU <junjie.liu@freescale.com>
drivers/usb/gadget/arcotg_udc.c

index 842c54eb790f374f5848866079af80d6374fbebf..ea81802a3ca6a9d282505317a8db799cc0d51d75 100755 (executable)
@@ -3432,6 +3432,7 @@ static int fsl_udc_resume(struct platform_device *pdev)
                /* if in host mode, we need to do nothing */
                if ((fsl_readl(&dr_regs->otgsc) & OTGSC_STS_USB_ID) == 0) {
                        dr_phy_low_power_mode(udc_controller, true);
+                       dr_wake_up_enable(udc_controller, true);
                        goto end;
                }
                dr_controller_setup(udc_controller);
@@ -3451,8 +3452,7 @@ end:
                 * subsystem will not leave from low power mode.
                 */
                if (!udc_can_wakeup_system() &&
-                       (pdata->pmflags == 0) &&
-                       (fsl_readl(&dr_regs->otgsc) & OTGSC_STS_USB_ID)) {
+                       (pdata->pmflags == 0)) {
                        dr_wake_up_enable(udc_controller, true);
                }