regulator: core: Handle full constraints systems when resolving supplies
authorMark Brown <broonie@kernel.org>
Tue, 14 Jul 2015 10:17:26 +0000 (11:17 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 15 Jul 2015 11:19:44 +0000 (12:19 +0100)
When resolving device supplies if we fail to look up the regulator we
substitute in the dummy supply instead if the system has fully specified
constraints. When resolving supplies for regulators we do not have the
equivalent code and instead just directly use the regulator_dev_lookup()
result causing spurious failures.

This does not affect DT systems since we are able to detect missing
mappings directly as part of regulator_dev_lookup() and so have appropriate
handling in the DT specific code.

Reported-by: Christian Hartmann <cornogle@googlemail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/core.c

index c9f72019bd689afbb4e51528932689dc097b191b..bb8528dfad8c8ea3f449f6d19738bfe6f1a5674b 100644 (file)
@@ -1381,9 +1381,13 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
        }
 
        if (!r) {
-               dev_err(dev, "Failed to resolve %s-supply for %s\n",
-                       rdev->supply_name, rdev->desc->name);
-               return -EPROBE_DEFER;
+               if (have_full_constraints()) {
+                       r = dummy_regulator_rdev;
+               } else {
+                       dev_err(dev, "Failed to resolve %s-supply for %s\n",
+                               rdev->supply_name, rdev->desc->name);
+                       return -EPROBE_DEFER;
+               }
        }
 
        /* Recursively resolve the supply of the supply */