diff options
| -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 be1e6ad6483..3be9e46594a 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", |