regulator: Check for constraints in regulator_init_complete()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 6e0c723371d86e2a5b13b49fd8a7554c1887262d..dfbf4312ec346c8161183bca75864652ca97a8f7 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2409,14 +2409,14 @@ static int __init regulator_init_complete(void)
                ops = rdev->desc->ops;
                c = rdev->constraints;
 
-               if (c->name)
+               if (c && c->name)
                        name = c->name;
                else if (rdev->desc->name)
                        name = rdev->desc->name;
                else
                        name = "regulator";
 
-               if (!ops->disable || c->always_on)
+               if (!ops->disable || (c && c->always_on))
                        continue;
 
                mutex_lock(&rdev->mutex);