diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-03 13:49:54 -0400 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-09-22 08:32:40 -0400 |
commit | b39480ac37951de126455991744c9dbb61bbb839 (patch) | |
tree | 67e44b051e3e4d4798733065c9aac6ad0f43318b /drivers/regulator | |
parent | c53ad7fe5759cea10137c9e176d14f8c8f22d286 (diff) |
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>
Diffstat (limited to 'drivers/regulator')
-rw-r--r-- | drivers/regulator/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index e38db55600e0..6e0c723371d8 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
@@ -232,7 +232,7 @@ static ssize_t regulator_name_show(struct device *dev, | |||
232 | struct regulator_dev *rdev = dev_get_drvdata(dev); | 232 | struct regulator_dev *rdev = dev_get_drvdata(dev); |
233 | const char *name; | 233 | const char *name; |
234 | 234 | ||
235 | if (rdev->constraints->name) | 235 | if (rdev->constraints && rdev->constraints->name) |
236 | name = rdev->constraints->name; | 236 | name = rdev->constraints->name; |
237 | else if (rdev->desc->name) | 237 | else if (rdev->desc->name) |
238 | name = rdev->desc->name; | 238 | name = rdev->desc->name; |