diff options
| author | Andy Green <andy.green@linaro.org> | 2011-04-26 05:41:47 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-05-02 12:38:29 +0800 |
| commit | ed1f1c5c5c39ae651515980f86ccf190a9900a33 (patch) | |
| tree | 40aff1738ef5ba3faf8a9ebcc25d6006a435fa95 /drivers/usb/musb/musb_core.c | |
| parent | 39a3e261066d9fd961a3426e7de4506708ac57e8 (diff) | |
musb protect otg timer references
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'drivers/usb/musb/musb_core.c')
| -rw-r--r-- | drivers/usb/musb/musb_core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 51d69cb28a1..c2915133291 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -847,12 +847,16 @@ b_host: DBG(1, "HNP: in %s, %d msec timeout\n", otg_state_string(musb), TA_WAIT_BCON(musb)); +#ifdef CONFIG_USB_MUSB_OTG mod_timer(&musb->otg_timer, jiffies + msecs_to_jiffies(TA_WAIT_BCON(musb))); +#endif break; case OTG_STATE_A_PERIPHERAL: musb->ignore_disconnect = 0; +#ifdef CONFIG_USB_MUSB_OTG del_timer(&musb->otg_timer); +#endif musb_g_reset(musb); break; case OTG_STATE_B_WAIT_ACON: |