From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 3 Aug 2009 17:49:54 +0000 (+0100)
Subject: regulator: Check for constraints before using them for name
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b39480ac37951de126455991744c9dbb61bbb839;p=linux-beck.git

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 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,
 	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;