1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 7c569f51212a..f2a63dd0dfce 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -265,6 +265,7 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci)
         unsigned long   flags;
         irqreturn_t     retval = IRQ_NONE;
         struct musb     *musb = __hci;
+        struct usb_otg  *otg = musb->xceiv->otg;
         void __iomem    *tibase = musb->ctrl_base;
         struct cppi     *cppi;
         u32             tmp;
@@ -331,14 +332,14 @@ static irqreturn_t davinci_musb_interrupt(int irq, void *__hci)
                         WARNING("VBUS error workaround (delay coming)\n");
                 } else if (is_host_enabled(musb) && drvvbus) {
                         MUSB_HST_MODE(musb);
-                        musb->xceiv->default_a = 1;
+                        otg->default_a = 1;
                         musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;
                         portstate(musb->port1_status |= USB_PORT_STAT_POWER);
                         del_timer(&otg_workaround);
                 } else {
                         musb->is_active = 0;
                         MUSB_DEV_MODE(musb);
-                        musb->xceiv->default_a = 0;
+                        otg->default_a = 0;
                         musb->xceiv->state = OTG_STATE_B_IDLE;
                         portstate(musb->port1_status &= ~USB_PORT_STAT_POWER);
                 }
@@ -464,7 +465,7 @@ static int davinci_musb_exit(struct musb *musb)
         davinci_musb_source_power(musb, 0 /*off*/, 1);
 
         /* delay, to avoid problems with module reload */
-        if (is_host_enabled(musb) && musb->xceiv->default_a) {
+        if (is_host_enabled(musb) && musb->xceiv->otg->default_a) {
                 int     maxdelay = 30;
                 u8      devctl, warn = 0;