diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 22:35:41 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 22:35:41 (GMT) |
| commit | ff9cce82772a78983b529e044d85884d3ec95fda (patch) | |
| tree | 6491adac0538739a415f7b776d1865ce7ae5d1f7 /drivers/usb/host/ohci-omap.c | |
| parent | 933141509cefd64102a943d61d154c5c53bad889 (diff) | |
| parent | f8ecf829481b2cc7301a811da9d2df53ef174977 (diff) | |
| download | linux-ff9cce82772a78983b529e044d85884d3ec95fda.tar.xz | |
Merge tag 'xceiv-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
usb: phy: patches for v3.6 merge window
We are starting to support multiple USB phys as
we should thanks for Kishon's work. DeviceTree support
for USB PHYs won't come until discussion with DeviceTree
maintainer is finished.
Together with that series, we have one fix for twl4030
which missed a IRQF_ONESHOT annotation when requesting
a threaded IRQ without a top half handler, and removal
of an unused variable compilation warning to isp1301_omap.
Diffstat (limited to 'drivers/usb/host/ohci-omap.c')
| -rw-r--r-- | drivers/usb/host/ohci-omap.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index eccddb4..076d201 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c @@ -18,6 +18,7 @@ #include <linux/jiffies.h> #include <linux/platform_device.h> #include <linux/clk.h> +#include <linux/err.h> #include <linux/gpio.h> #include <mach/hardware.h> @@ -212,14 +213,14 @@ static int ohci_omap_init(struct usb_hcd *hcd) #ifdef CONFIG_USB_OTG if (need_transceiver) { - hcd->phy = usb_get_transceiver(); - if (hcd->phy) { + hcd->phy = usb_get_phy(USB_PHY_TYPE_USB2); + if (!IS_ERR_OR_NULL(hcd->phy)) { int status = otg_set_host(hcd->phy->otg, &ohci_to_hcd(ohci)->self); dev_dbg(hcd->self.controller, "init %s phy, status %d\n", hcd->phy->label, status); if (status) { - usb_put_transceiver(hcd->phy); + usb_put_phy(hcd->phy); return status; } } else { @@ -404,9 +405,9 @@ usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev) struct ohci_hcd *ohci = hcd_to_ohci (hcd); usb_remove_hcd(hcd); - if (hcd->phy) { + if (!IS_ERR_OR_NULL(hcd->phy)) { (void) otg_set_host(hcd->phy->otg, 0); - usb_put_transceiver(hcd->phy); + usb_put_phy(hcd->phy); } if (machine_is_omap_osk()) gpio_free(9); |