diff options
| author | Tony LIU <junjie.liu@freescale.com> | 2012-06-01 17:55:17 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:38:22 +0800 |
| commit | ead9ee46f1e52f8913c4d9df9a5eb633f7ab2122 (patch) | |
| tree | ad73cfa646ef76e6c1563da665e9b59d3502534b /drivers/usb | |
| parent | 9a9c9cb76d17b1d2cf26980d20999ea01d0df105 (diff) | |
ENGR00211329-1 Fix system dump of unhandled usb irq
Revert "ENGR00211686 mx6 usb: system crash after suspend/resume"
This reverts commit eb0fdddfc19ec5597f5973499765a5a8f5e75749.
Signed-off-by: Tony LIU <junjie.liu@freescale.com>
Diffstat (limited to 'drivers/usb')
| -rwxr-xr-x | drivers/usb/gadget/arcotg_udc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/arcotg_udc.c b/drivers/usb/gadget/arcotg_udc.c index 842c54eb790f..ea81802a3ca6 100755 --- a/drivers/usb/gadget/arcotg_udc.c +++ b/drivers/usb/gadget/arcotg_udc.c @@ -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); } |