From 8f762639e4a3efe37a52ca31a69a8e4d9813f5b6 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Thu, 23 Aug 2012 12:19:18 -0600 Subject: [PATCH] --- yaml --- r: 323357 b: refs/heads/master c: 5fc72f57e62e10d9d8347ae20f13820d811377da h: refs/heads/master i: 323355: c85f1224cee198e8a06218b1e931fe18aea008a9 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/max8907-regulator.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2d6b0194f40e..3f9ff7e5165d 100644 --- 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 index 3a5104f6eed4..e97af8ef3aea 100644 --- 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: