1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 5c78f9e71466..a44294d13494 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -242,15 +242,6 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
 
         ehci_reset(omap_ehci);
 
-        ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
-        if (ret) {
-                dev_err(dev, "failed to add hcd with err %d\n", ret);
-                goto err_add_hcd;
-        }
-
-        /* root ports should always stay powered */
-        ehci_port_power(omap_ehci, 1);
-
         if (pdata->phy_reset) {
                 /* Hold the PHY in RESET for enough time till
                  * PHY is settled and ready
@@ -258,12 +249,21 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
                 udelay(10);
 
                 if (gpio_is_valid(pdata->reset_gpio_port[0]))
-                        gpio_set_value(pdata->reset_gpio_port[0], 1);
+                        gpio_set_value_cansleep(pdata->reset_gpio_port[0], 1);
 
                 if (gpio_is_valid(pdata->reset_gpio_port[1]))
-                        gpio_set_value(pdata->reset_gpio_port[1], 1);
+                        gpio_set_value_cansleep(pdata->reset_gpio_port[1], 1);
         }
 
+        ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
+        if (ret) {
+                dev_err(dev, "failed to add hcd with err %d\n", ret);
+                goto err_add_hcd;
+        }
+
+        /* root ports should always stay powered */
+        ehci_port_power(omap_ehci, 1);
+
         return 0;
 
 err_add_hcd: