aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/musb_gadget.c
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>2012-02-13 06:24:15 -0500
committerFelipe Balbi <balbi@ti.com>2012-02-13 06:52:54 -0500
commitd445b6da8da491e025eb60576ce959f6a3a56a4f (patch)
tree06bf3afc86c3c6248a9c2d980cf359bdb008447e /drivers/usb/musb/musb_gadget.c
parent76eb57ec1bf3201d2f417cafa5c974e7c0b6aaf9 (diff)
usb: musb: Start using struct usb_otg
Use struct usb_otg members with OTG specific functions instead of usb_phy members. [ balbi@ti.com: added a missing change on musb_gadget.c to avoid a compile error on a later patch ] Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb/musb_gadget.c')
-rw-r--r--drivers/usb/musb/musb_gadget.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index ac3d2eec20fe..0524a34be3c7 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1898,6 +1898,7 @@ static int musb_gadget_start(struct usb_gadget *g,
1898 struct usb_gadget_driver *driver) 1898 struct usb_gadget_driver *driver)
1899{ 1899{
1900 struct musb *musb = gadget_to_musb(g); 1900 struct musb *musb = gadget_to_musb(g);
1901 struct usb_otg *otg = musb->xceiv->otg;
1901 unsigned long flags; 1902 unsigned long flags;
1902 int retval = -EINVAL; 1903 int retval = -EINVAL;
1903 1904
@@ -1945,7 +1946,7 @@ static int musb_gadget_start(struct usb_gadget *g,
1945 } 1946 }
1946 1947
1947 if ((musb->xceiv->last_event == USB_EVENT_ID) 1948 if ((musb->xceiv->last_event == USB_EVENT_ID)
1948 && musb->xceiv->set_vbus) 1949 && otg->set_vbus)
1949 otg_set_vbus(musb->xceiv, 1); 1950 otg_set_vbus(musb->xceiv, 1);
1950 1951
1951 hcd->self.uses_pio_for_control = 1; 1952 hcd->self.uses_pio_for_control = 1;