---

yaml --- r: 323357 b: refs/heads/master c: 5fc72f5 h: refs/heads/master i: 323355: c85f122 v: v3
git-mirror · Aug 28, 2012 · 8f76263 · 8f76263
1 parent 9e6fb74
commit 8f76263
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dedae957a41b4f4523199f7a822ee4e5735640b0
+refs/heads/master: 5fc72f57e62e10d9d8347ae20f13820d811377da
diff --git a/trunk/drivers/regulator/max8907-regulator.c b/trunk/drivers/regulator/max8907-regulator.c
@@ -323,7 +323,10 @@ static __devinit int max8907_regulator_probe(struct platform_device *pdev)
 
 		switch (pmic->desc[i].id) {
 		case MAX8907_MBATT:
-			mbatt_rail_name = idata->constraints.name;
+			if (idata && idata->constraints.name)
+				mbatt_rail_name = idata->constraints.name;
+			else
+				mbatt_rail_name = pmic->desc[i].name;
 			break;
 		case MAX8907_BBAT:
 		case MAX8907_SDBY: