diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-03 17:49:54 (GMT) |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-09-22 12:32:40 (GMT) |
| commit | b39480ac37951de126455991744c9dbb61bbb839 (patch) | |
| tree | 67e44b051e3e4d4798733065c9aac6ad0f43318b | |
| parent | c53ad7fe5759cea10137c9e176d14f8c8f22d286 (diff) | |
| download | linux-b39480ac37951de126455991744c9dbb61bbb839.tar.xz | |
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>
| -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 e38db55..6e0c723 100644 --- 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; |