regulator: Check for constraints before using them for name

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 e38db55600e0d81ec2e9efa8fa07cde7f5fd09f6..6e0c723371d86e2a5b13b49fd8a7554c1887262d 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -232,7 +232,7 @@ static ssize_t regulator_name_show(struct device *dev,
        struct regulator_dev *rdev = dev_get_drvdata(dev);
        const char *name;
 
-       if (rdev->constraints->name)
+       if (rdev->constraints && rdev->constraints->name)
                name = rdev->constraints->name;
        else if (rdev->desc->name)
                name = rdev->desc->name;