1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index c7fe16db6bb6..e0d81b8318ab 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -121,6 +121,7 @@ struct dsps_glue {
         unsigned long last_timer;    /* last timer data for each instance */
 };
 
+static void dsps_musb_try_idle(struct musb *musb, unsigned long timeout);
 /**
  * dsps_musb_enable - enable interrupts
  */
@@ -143,6 +144,7 @@ static void dsps_musb_enable(struct musb *musb)
         /* Force the DRVVBUS IRQ so we can start polling for ID change. */
         dsps_writel(reg_base, wrp->coreintr_set,
                     (1 << wrp->drvvbus) << wrp->usb_shift);
+        dsps_musb_try_idle(musb, 0);
 }
 
 /**
@@ -234,6 +236,9 @@ static void dsps_musb_try_idle(struct musb *musb, unsigned long timeout)
         if (musb->port_mode == MUSB_PORT_MODE_HOST)
                 return;
 
+        if (!musb->g.dev.driver)
+                return;
+
         if (time_after(glue->last_timer, timeout) &&
                                 timer_pending(&glue->timer)) {
                 dev_dbg(musb->controller,