evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regulator: ab3100: Fix regulator register error handling

Browse source 
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>
This commit is contained in:
Axel Lin 2013-04-26 21:57:09 +08:00 • committed by Mark Brown
parent 8735bc2fe6
commit 018fd856ce
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/regulator/ab3100.c
View file

@ -609,6 +609,19 @@ static const u8 ab3100_reg_initvals[] = {
LDO_D_SETTING, 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 static int
ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np) ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np)
{ {
@ -635,9 +648,11 @@ ab3100_regulator_of_probe(struct platform_device *pdev, struct device_node *np)
pdev, NULL, ab3100_regulator_matches[i].init_data, pdev, NULL, ab3100_regulator_matches[i].init_data,
ab3100_regulator_matches[i].of_node, ab3100_regulator_matches[i].of_node,
(int) ab3100_regulator_matches[i].driver_data); (int) ab3100_regulator_matches[i].driver_data);
if (err) if (err) {
ab3100_regulators_remove(pdev);
return err; return err;
} }
}
return 0; return 0;
} }
@ -695,22 +710,12 @@ static int ab3100_regulators_probe(struct platform_device *pdev)
err = ab3100_regulator_register(pdev, plfdata, NULL, NULL, err = ab3100_regulator_register(pdev, plfdata, NULL, NULL,
desc->id); desc->id);
if (err) if (err) {
ab3100_regulators_remove(pdev);
return err; 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; return 0;
} }