From 8d85dc0f4206e862b83189c755b3ff00d932b5eb Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 3 Aug 2009 18:49:54 +0100
Subject: [PATCH] --- yaml --- r: 165386 b: refs/heads/master c:
 b39480ac37951de126455991744c9dbb61bbb839 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/regulator/core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5edf624c8177..0dbec49993d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c53ad7fe5759cea10137c9e176d14f8c8f22d286
+refs/heads/master: b39480ac37951de126455991744c9dbb61bbb839
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index e38db55600e0..6e0c723371d8 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/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;