diff options
author | Markus Pargmann <mpa@pengutronix.de> | 2015-04-10 09:23:42 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-10 13:17:53 -0400 |
commit | c0cf5a59fb69527151eb8e332a1b9660200f66c6 (patch) | |
tree | 49c30d63791ded52d3bf221b621beecab57c087a | |
parent | dfb85ba1140ab649f6f0bf3e502ac37c0f69dbcb (diff) |
regulator: max8660: Handle empty regulator data
It is not necessary to have regulator init data for a regulator. This
patch removes the necessity of this data and handles a NULL pointer
properly.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/regulator/max8660.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c index f187c8f13e22..4071d74fa828 100644 --- a/drivers/regulator/max8660.c +++ b/drivers/regulator/max8660.c | |||
@@ -442,9 +442,9 @@ static int max8660_probe(struct i2c_client *client, | |||
442 | for (i = 0; i < pdata->num_subdevs; i++) { | 442 | for (i = 0; i < pdata->num_subdevs; i++) { |
443 | 443 | ||
444 | if (!pdata->subdevs[i].platform_data) | 444 | if (!pdata->subdevs[i].platform_data) |
445 | return ret; | 445 | boot_on = false; |
446 | 446 | else | |
447 | boot_on = pdata->subdevs[i].platform_data->constraints.boot_on; | 447 | boot_on = pdata->subdevs[i].platform_data->constraints.boot_on; |
448 | 448 | ||
449 | switch (pdata->subdevs[i].id) { | 449 | switch (pdata->subdevs[i].id) { |
450 | case MAX8660_V3: | 450 | case MAX8660_V3: |