Merge 3.5-rc7 into usb-next

This resolves the merge issue with the drivers/usb/host/ehci-omap.c
file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index e5ccd2979773..122911978da2 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -415,8 +415,8 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
         if (!isp)
                 return -ENOMEM;
 
-        isp->phy = usb_get_transceiver();
-        if (!isp->phy)
+        isp->phy = usb_get_phy(USB_PHY_TYPE_USB2);
+        if (IS_ERR_OR_NULL(isp->phy))
                 goto fail0;
 
         isp->dev = &pdev->dev;
@@ -475,7 +475,7 @@ fail2:
         power_supply_unregister(&isp->psy);
 fail1:
         isp1704_charger_set_power(isp, 0);
-        usb_put_transceiver(isp->phy);
+        usb_put_phy(isp->phy);
 fail0:
         kfree(isp);
 
@@ -490,7 +490,7 @@ static int __devexit isp1704_charger_remove(struct platform_device *pdev)
 
         usb_unregister_notifier(isp->phy, &isp->nb);
         power_supply_unregister(&isp->psy);
-        usb_put_transceiver(isp->phy);
+        usb_put_phy(isp->phy);
         isp1704_charger_set_power(isp, 0);
         kfree(isp);