Merge remote-tracking branches 'regulator/topic/lp8788', 'regulator/topic/mt6311...

[linux-drm-fsl-dcu.git] / drivers / regulator / core.c

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 4753f5f43fa508ab0518440f441a40605b6b5ac6..744c9889f88d4f83e27c05687ac14427c833c0c5 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3446,8 +3446,10 @@ int regulator_bulk_get(struct device *dev, int num_consumers,
                consumers[i].consumer = NULL;
 
        for (i = 0; i < num_consumers; i++) {
-               consumers[i].consumer = regulator_get(dev,
-                                                     consumers[i].supply);
+               consumers[i].consumer = _regulator_get(dev,
+                                                      consumers[i].supply,
+                                                      false,
+                                                      !consumers[i].optional);
                if (IS_ERR(consumers[i].consumer)) {
                        ret = PTR_ERR(consumers[i].consumer);
                        dev_err(dev, "Failed to get supply '%s': %d\n",