diff options
| author | Greg Kroah-Hartman | 2012-03-01 17:45:33 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-03-01 17:45:33 +0100 |
| commit | 8062d94a545457a83d5291bd62c3bfd14200bba0 (patch) | |
| tree | a6a7aaaea5dff00f7415a93189720a1164ae30dd /drivers/usb/gadget/mv_udc_core.c | |
| parent | Merge tag 'musb-for-v3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ba... (diff) | |
| parent | usb: otg: Convert all users to pass struct usb_otg for OTG functions (diff) | |
| download | kernel-qcow2-linux-8062d94a545457a83d5291bd62c3bfd14200bba0.tar.gz kernel-qcow2-linux-8062d94a545457a83d5291bd62c3bfd14200bba0.tar.xz kernel-qcow2-linux-8062d94a545457a83d5291bd62c3bfd14200bba0.zip | |
Merge tag 'xceiv-for-v3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
USB: transceiver changes for 3.4
Here we have a big rework done by Heikki Krogerus (thanks) which
splits OTG functionality away from transceivers.
We have known for quite a long time that struct otg_transceiver was
a bad name for the structure, considering transceiver is far from
being OTG-specific (see 4e67185).
Diffstat (limited to 'drivers/usb/gadget/mv_udc_core.c')
| -rw-r--r-- | drivers/usb/gadget/mv_udc_core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c index f97e737d26f7..7369fd92c03f 100644 --- a/drivers/usb/gadget/mv_udc_core.c +++ b/drivers/usb/gadget/mv_udc_core.c @@ -1384,7 +1384,8 @@ static int mv_udc_start(struct usb_gadget_driver *driver, } if (udc->transceiver) { - retval = otg_set_peripheral(udc->transceiver, &udc->gadget); + retval = otg_set_peripheral(udc->transceiver->otg, + &udc->gadget); if (retval) { dev_err(&udc->dev->dev, "unable to register peripheral to otg\n"); @@ -2181,7 +2182,7 @@ static int __devinit mv_udc_probe(struct platform_device *dev) #ifdef CONFIG_USB_OTG_UTILS if (pdata->mode == MV_USB_MODE_OTG) - udc->transceiver = otg_get_transceiver(); + udc->transceiver = usb_get_transceiver(); #endif udc->clknum = pdata->clknum; |