1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
index a936bbcff8f4..0e8c168ca24c 100644
--- a/drivers/usb/host/ehci-mv.c
+++ b/drivers/usb/host/ehci-mv.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/err.h>
 #include <linux/usb/otg.h>
 #include <linux/platform_data/mv_usb.h>
 
@@ -253,8 +254,8 @@ static int mv_ehci_probe(struct platform_device *pdev)
         ehci_mv->mode = pdata->mode;
         if (ehci_mv->mode == MV_USB_MODE_OTG) {
 #ifdef CONFIG_USB_OTG_UTILS
-                ehci_mv->otg = usb_get_transceiver();
-                if (!ehci_mv->otg) {
+                ehci_mv->otg = usb_get_phy(USB_PHY_TYPE_USB2);
+                if (IS_ERR_OR_NULL(ehci_mv->otg)) {
                         dev_err(&pdev->dev,
                                 "unable to find transceiver\n");
                         retval = -ENODEV;
@@ -302,8 +303,8 @@ err_set_vbus:
                 pdata->set_vbus(0);
 #ifdef CONFIG_USB_OTG_UTILS
 err_put_transceiver:
-        if (ehci_mv->otg)
-                usb_put_transceiver(ehci_mv->otg);
+        if (!IS_ERR_OR_NULL(ehci_mv->otg))
+                usb_put_phy(ehci_mv->otg);
 #endif
 err_disable_clk:
         mv_ehci_disable(ehci_mv);
@@ -331,9 +332,9 @@ static int mv_ehci_remove(struct platform_device *pdev)
         if (hcd->rh_registered)
                 usb_remove_hcd(hcd);
 
-        if (ehci_mv->otg) {
+        if (!IS_ERR_OR_NULL(ehci_mv->otg)) {
                 otg_set_host(ehci_mv->otg->otg, NULL);
-                usb_put_transceiver(ehci_mv->otg);
+                usb_put_phy(ehci_mv->otg);
         }
 
         if (ehci_mv->mode == MV_USB_MODE_HOST) {