1 files changed, 15 insertions, 12 deletions

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 06204b77fc4c..5d8981c5235e 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -392,18 +392,6 @@ static irqreturn_t ci_irq(int irq, void *data)
 static int ci_get_platdata(struct device *dev,
                 struct ci_hdrc_platform_data *platdata)
 {
-        /* Get the vbus regulator */
-        platdata->reg_vbus = devm_regulator_get(dev, "vbus");
-        if (PTR_ERR(platdata->reg_vbus) == -EPROBE_DEFER) {
-                return -EPROBE_DEFER;
-        } else if (PTR_ERR(platdata->reg_vbus) == -ENODEV) {
-                platdata->reg_vbus = NULL; /* no vbus regualator is needed */
-        } else if (IS_ERR(platdata->reg_vbus)) {
-                dev_err(dev, "Getting regulator error: %ld\n",
-                        PTR_ERR(platdata->reg_vbus));
-                return PTR_ERR(platdata->reg_vbus);
-        }
-
         if (!platdata->phy_mode)
                 platdata->phy_mode = of_usb_get_phy_mode(dev->of_node);
 
@@ -413,6 +401,21 @@ static int ci_get_platdata(struct device *dev,
         if (platdata->dr_mode == USB_DR_MODE_UNKNOWN)
                 platdata->dr_mode = USB_DR_MODE_OTG;
 
+        if (platdata->dr_mode != USB_DR_MODE_PERIPHERAL) {
+                /* Get the vbus regulator */
+                platdata->reg_vbus = devm_regulator_get(dev, "vbus");
+                if (PTR_ERR(platdata->reg_vbus) == -EPROBE_DEFER) {
+                        return -EPROBE_DEFER;
+                } else if (PTR_ERR(platdata->reg_vbus) == -ENODEV) {
+                        /* no vbus regualator is needed */
+                        platdata->reg_vbus = NULL;
+                } else if (IS_ERR(platdata->reg_vbus)) {
+                        dev_err(dev, "Getting regulator error: %ld\n",
+                                PTR_ERR(platdata->reg_vbus));
+                        return PTR_ERR(platdata->reg_vbus);
+                }
+        }
+
         return 0;
 }