From d278dec6b15ca9b47c349408ce8b311eb721fbbb Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 3 Aug 2009 18:49:55 +0100
Subject: [PATCH] --- yaml --- r: 165387 b: refs/heads/master c:
 f25e0b4fcc38d120e704c377791158c4b2a54daa h: refs/heads/master i:   165385:
 c29240ae4490948f12d49a73bf215ed919fcce1a   165383:
 d511761745c7991949ab53c86a2338467cf7bc95 v: v3

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

diff --git a/[refs] b/[refs]
index 0dbec49993d5..b7d66d0c8c2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b39480ac37951de126455991744c9dbb61bbb839
+refs/heads/master: f25e0b4fcc38d120e704c377791158c4b2a54daa
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 6e0c723371d8..dfbf4312ec34 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -2409,14 +2409,14 @@ static int __init regulator_init_complete(void)
 		ops = rdev->desc->ops;
 		c = rdev->constraints;
 
-		if (c->name)
+		if (c && c->name)
 			name = c->name;
 		else if (rdev->desc->name)
 			name = rdev->desc->name;
 		else
 			name = "regulator";
 
-		if (!ops->disable || c->always_on)
+		if (!ops->disable || (c && c->always_on))
 			continue;
 
 		mutex_lock(&rdev->mutex);