1 files changed, 29 insertions, 10 deletions

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index ac3d2eec20fe..f42c29b11f71 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -574,6 +574,15 @@ void musb_g_tx(struct musb *musb, u8 epnum)
 
                 if (request->actual == request->length) {
                         musb_g_giveback(musb_ep, request, 0);
+                        /*
+                         * In the giveback function the MUSB lock is
+                         * released and acquired after sometime. During
+                         * this time period the INDEX register could get
+                         * changed by the gadget_queue function especially
+                         * on SMP systems. Reselect the INDEX to be sure
+                         * we are reading/modifying the right registers
+                         */
+                        musb_ep_select(mbase, epnum);
                         req = musb_ep->desc ? next_request(musb_ep) : NULL;
                         if (!req) {
                                 dev_dbg(musb->controller, "%s idle now\n",
@@ -983,6 +992,15 @@ void musb_g_rx(struct musb *musb, u8 epnum)
                 }
 #endif
                 musb_g_giveback(musb_ep, request, 0);
+                /*
+                 * In the giveback function the MUSB lock is
+                 * released and acquired after sometime. During
+                 * this time period the INDEX register could get
+                 * changed by the gadget_queue function especially
+                 * on SMP systems. Reselect the INDEX to be sure
+                 * we are reading/modifying the right registers
+                 */
+                musb_ep_select(mbase, epnum);
 
                 req = next_request(musb_ep);
                 if (!req)
@@ -1624,7 +1642,7 @@ static int musb_gadget_wakeup(struct usb_gadget *gadget)
                 }
 
                 spin_unlock_irqrestore(&musb->lock, flags);
-                otg_start_srp(musb->xceiv);
+                otg_start_srp(musb->xceiv->otg);
                 spin_lock_irqsave(&musb->lock, flags);
 
                 /* Block idling for at least 1s */
@@ -1703,7 +1721,7 @@ static int musb_gadget_vbus_draw(struct usb_gadget *gadget, unsigned mA)
 
         if (!musb->xceiv->set_power)
                 return -EOPNOTSUPP;
-        return otg_set_power(musb->xceiv, mA);
+        return usb_phy_set_power(musb->xceiv, mA);
 }
 
 static int musb_gadget_pullup(struct usb_gadget *gadget, int is_on)
@@ -1762,7 +1780,7 @@ static void musb_gadget_release(struct device *dev)
 }
 
 
-static void __init
+static void __devinit
 init_peripheral_ep(struct musb *musb, struct musb_ep *ep, u8 epnum, int is_in)
 {
         struct musb_hw_ep       *hw_ep = musb->endpoints + epnum;
@@ -1799,7 +1817,7 @@ init_peripheral_ep(struct musb *musb, struct musb_ep *ep, u8 epnum, int is_in)
  * Initialize the endpoints exposed to peripheral drivers, with backlinks
  * to the rest of the driver state.
  */
-static inline void __init musb_g_init_endpoints(struct musb *musb)
+static inline void __devinit musb_g_init_endpoints(struct musb *musb)
 {
         u8                      epnum;
         struct musb_hw_ep       *hw_ep;
@@ -1832,7 +1850,7 @@ static inline void __init musb_g_init_endpoints(struct musb *musb)
 /* called once during driver setup to initialize and link into
  * the driver model; memory is zeroed.
  */
-int __init musb_gadget_setup(struct musb *musb)
+int __devinit musb_gadget_setup(struct musb *musb)
 {
         int status;
 
@@ -1898,6 +1916,7 @@ static int musb_gadget_start(struct usb_gadget *g,
                 struct usb_gadget_driver *driver)
 {
         struct musb             *musb = gadget_to_musb(g);
+        struct usb_otg          *otg = musb->xceiv->otg;
         unsigned long           flags;
         int                     retval = -EINVAL;
 
@@ -1914,7 +1933,7 @@ static int musb_gadget_start(struct usb_gadget *g,
         spin_lock_irqsave(&musb->lock, flags);
         musb->is_active = 1;
 
-        otg_set_peripheral(musb->xceiv, &musb->g);
+        otg_set_peripheral(otg, &musb->g);
         musb->xceiv->state = OTG_STATE_B_IDLE;
 
         /*
@@ -1938,15 +1957,15 @@ static int musb_gadget_start(struct usb_gadget *g,
                  * handles power budgeting ... this way also
                  * ensures HdrcStart is indirectly called.
                  */
-                retval = usb_add_hcd(musb_to_hcd(musb), -1, 0);
+                retval = usb_add_hcd(musb_to_hcd(musb), 0, 0);
                 if (retval < 0) {
                         dev_dbg(musb->controller, "add_hcd failed, %d\n", retval);
                         goto err2;
                 }
 
                 if ((musb->xceiv->last_event == USB_EVENT_ID)
-                                        && musb->xceiv->set_vbus)
-                        otg_set_vbus(musb->xceiv, 1);
+                                        && otg->set_vbus)
+                        otg_set_vbus(otg, 1);
 
                 hcd->self.uses_pio_for_control = 1;
         }
@@ -2028,7 +2047,7 @@ static int musb_gadget_stop(struct usb_gadget *g,
 
         musb->xceiv->state = OTG_STATE_UNDEFINED;
         stop_activity(musb, driver);
-        otg_set_peripheral(musb->xceiv, NULL);
+        otg_set_peripheral(musb->xceiv->otg, NULL);
 
         dev_dbg(musb->controller, "unregistering driver %s\n", driver->function);