diff options
-rw-r--r-- | drivers/regulator/max8907-regulator.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/regulator/max8907-regulator.c b/drivers/regulator/max8907-regulator.c index 3a5104f6eed4..e97af8ef3aea 100644 --- a/drivers/regulator/max8907-regulator.c +++ b/drivers/regulator/max8907-regulator.c | |||
@@ -323,7 +323,10 @@ static __devinit int max8907_regulator_probe(struct platform_device *pdev) | |||
323 | 323 | ||
324 | switch (pmic->desc[i].id) { | 324 | switch (pmic->desc[i].id) { |
325 | case MAX8907_MBATT: | 325 | case MAX8907_MBATT: |
326 | mbatt_rail_name = idata->constraints.name; | 326 | if (idata && idata->constraints.name) |
327 | mbatt_rail_name = idata->constraints.name; | ||
328 | else | ||
329 | mbatt_rail_name = pmic->desc[i].name; | ||
327 | break; | 330 | break; |
328 | case MAX8907_BBAT: | 331 | case MAX8907_BBAT: |
329 | case MAX8907_SDBY: | 332 | case MAX8907_SDBY: |