1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 227c1dfa6be..de7405e6d7d 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1431,7 +1431,7 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
                 struct musb_hw_ep       *hw_ep = musb->endpoints + i;
 
                 hw_ep->fifo = MUSB_FIFO_OFFSET(i) + mbase;
-#ifdef CONFIG_USB_MUSB_TUSB6010
+#if defined(CONFIG_USB_MUSB_TUSB6010) || defined (CONFIG_USB_MUSB_TUSB6010_MODULE)
                 hw_ep->fifo_async = musb->async + 0x400 + MUSB_FIFO_OFFSET(i);
                 hw_ep->fifo_sync = musb->sync + 0x400 + MUSB_FIFO_OFFSET(i);
                 hw_ep->fifo_sync_va =
@@ -1630,6 +1630,7 @@ void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit)
                 }
         }
 }
+EXPORT_SYMBOL_GPL(musb_dma_completion);
 
 #else
 #define use_dma                 0
@@ -2157,6 +2158,7 @@ static void musb_save_context(struct musb *musb)
                 if (!epio)
                         continue;
 
+                musb_writeb(musb_base, MUSB_INDEX, i);
                 musb->context.index_regs[i].txmaxp =
                         musb_readw(epio, MUSB_TXMAXP);
                 musb->context.index_regs[i].txcsr =
@@ -2232,6 +2234,7 @@ static void musb_restore_context(struct musb *musb)
                 if (!epio)
                         continue;
 
+                musb_writeb(musb_base, MUSB_INDEX, i);
                 musb_writew(epio, MUSB_TXMAXP,
                         musb->context.index_regs[i].txmaxp);
                 musb_writew(epio, MUSB_TXCSR,