diff options
| author | Axel Lin <axel.lin@ingics.com> | 2013-04-26 21:57:09 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-26 16:33:10 +0100 |
| commit | 018fd856cee9ebe794da1382ff7fafae64781dc5 (patch) | |
| tree | f8ac600c4c71919de6d8d6f9165f62f4b5db560f /drivers/regulator | |
| parent | 8735bc2fe69c3cd18c54dc1b993106dbeb7618be (diff) | |
regulator: ab3100: Fix regulator register error handling
Ensure to unregister all regulators before return error in probe().
The regulator register order depends on the regulator ID pass to
ab3100_regulator_register() function. Thus we need to scan ab3100_regulator_desc
and find the index of successfully registered regulators, or alternatively just
call ab3100_regulators_remove() to unregister all registered regulators.
Since current code uses a static ab3100_regulators table, explicitly set
reg->rdev = NULL after regulator_unregister() call to ensure calling
ab3100_regulators_remove() in the unwind path always work.
Also move ab3100_regulators_remove() to avoid forward declaration.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/ab3100.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c index be1e6ad64830..3be9e46594a1 100644 --- a/drivers/regulator/ab3100.c +++ b/drivers/regulator/ab3100.c @@ -609,6 +609,19 @@ static const u8 ab3100_reg_initvals[] = { LDO_D_SETTING, }; +static int ab3100_regulators_remove(struct platform_device *pdev) +{ + int i; + + for (i = 0; i < AB3100_NUM_REGULATORS; i++) { + struct ab3100_regulator *reg = &ab3100_regulators[i]; + + regulator_unregister(reg->rdev); + reg->rdev = NULL; + } + return 0; +} + static int ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np) { @@ -635,8 +648,10 @@ ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np) pdev, NULL, ab3100_regulator_matches[i].init_data, ab3100_regulator_matches[i].of_node, (int) ab3100_regulator_matches[i].driver_data); - if (err) + if (err) { + ab3100_regulators_remove(pdev); return err; + } } return 0; @@ -695,25 +710,15 @@ static int ab3100_regulators_probe(struct platform_device *pdev) err = ab3100_regulator_register(pdev, plfdata, NULL, NULL, desc->id); - if (err) + if (err) { + ab3100_regulators_remove(pdev); return err; + } } return 0; } -static int ab3100_regulators_remove(struct platform_device *pdev) -{ - int i; - - for (i = 0; i < AB3100_NUM_REGULATORS; i++) { - struct ab3100_regulator *reg = &ab3100_regulators[i]; - - regulator_unregister(reg->rdev); - } - return 0; -} - static struct platform_driver ab3100_regulators_driver = { .driver = { .name = "ab3100-regulators", |