Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/usb/otg/gpio_vbus.c b/drivers/usb/otg/gpio_vbus.c
index 221c44444ec6..52733d9959b4 100644
--- a/drivers/usb/otg/gpio_vbus.c
+++ b/drivers/usb/otg/gpio_vbus.c
@@ -279,6 +279,13 @@ static int __init gpio_vbus_probe(struct platform_device *pdev)
         }
         INIT_WORK(&gpio_vbus->work, gpio_vbus_work);
 
+        gpio_vbus->vbus_draw = regulator_get(&pdev->dev, "vbus_draw");
+        if (IS_ERR(gpio_vbus->vbus_draw)) {
+                dev_dbg(&pdev->dev, "can't get vbus_draw regulator, err: %ld\n",
+                        PTR_ERR(gpio_vbus->vbus_draw));
+                gpio_vbus->vbus_draw = NULL;
+        }
+
         /* only active when a gadget is registered */
         err = otg_set_transceiver(&gpio_vbus->otg);
         if (err) {
@@ -287,13 +294,6 @@ static int __init gpio_vbus_probe(struct platform_device *pdev)
                 goto err_otg;
         }
 
-        gpio_vbus->vbus_draw = regulator_get(&pdev->dev, "vbus_draw");
-        if (IS_ERR(gpio_vbus->vbus_draw)) {
-                dev_dbg(&pdev->dev, "can't get vbus_draw regulator, err: %ld\n",
-                        PTR_ERR(gpio_vbus->vbus_draw));
-                gpio_vbus->vbus_draw = NULL;
-        }
-
         return 0;
 err_otg:
         free_irq(irq, &pdev->dev);