---

yaml --- r: 165387 b: refs/heads/master c: f25e0b4 h: refs/heads/master i: 165385: c29240a 165383: d511761 v: v3
git-mirror · Sep 22, 2009 · d278dec · d278dec
1 parent 8d85dc0
commit d278dec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);