usb: musb: dsps: kill OTG timer on suspend
authorFelipe Balbi <balbi@ti.com>
Mon, 15 Sep 2014 14:03:24 +0000 (09:03 -0500)
committerFelipe Balbi <balbi@ti.com>
Tue, 16 Sep 2014 15:01:44 +0000 (10:01 -0500)
if we don't make sure to kill the timer, it could
expire after we have already gated our clocks.

That will trigger a Data Abort exception because
we would try to access register while clock is gated.

Fix that bug.

Cc: <stable@vger.kernel.org> # v3.14+
Fixes 869c597 (usb: musb: dsps: add support for suspend and resume)
Tested-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/musb/musb_dsps.c

index c791ba5..154bcf1 100644 (file)
@@ -870,6 +870,7 @@ static int dsps_suspend(struct device *dev)
        struct musb *musb = platform_get_drvdata(glue->musb);
        void __iomem *mbase = musb->ctrl_base;
 
+       del_timer_sync(&glue->timer);
        glue->context.control = dsps_readl(mbase, wrp->control);
        glue->context.epintr = dsps_readl(mbase, wrp->epintr_set);
        glue->context.coreintr = dsps_readl(mbase, wrp->coreintr_set);
@@ -895,6 +896,7 @@ static int dsps_resume(struct device *dev)
        dsps_writel(mbase, wrp->mode, glue->context.mode);
        dsps_writel(mbase, wrp->tx_mode, glue->context.tx_mode);
        dsps_writel(mbase, wrp->rx_mode, glue->context.rx_mode);
+       setup_timer(&glue->timer, otg_timer, (unsigned long) musb);
 
        return 0;
 }