regulator: palmas: Fix palmas_probe error handling
Fix below error handling cases: 1. If reading PALMAS_SMPS_CTRL fails, simply returns ret rather than goto err_unregister_regulator because we have not call regulator_register(). 2. If palmas_ldo_init() fails, we need to call regulator_unregister() for the regulator we just successfully registered in this for loop iteration. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
2735daeb16
commit
1c9d2d71a3
|
@ -633,7 +633,7 @@ static __devinit int palmas_probe(struct platform_device *pdev)
|
|||
|
||||
ret = palmas_smps_read(palmas, PALMAS_SMPS_CTRL, ®);
|
||||
if (ret)
|
||||
goto err_unregister_regulator;
|
||||
return ret;
|
||||
|
||||
if (reg & PALMAS_SMPS_CTRL_SMPS12_SMPS123_EN)
|
||||
pmic->smps123 = 1;
|
||||
|
@ -783,11 +783,13 @@ static __devinit int palmas_probe(struct platform_device *pdev)
|
|||
reg_init = pdata->reg_init[id];
|
||||
if (reg_init) {
|
||||
ret = palmas_ldo_init(palmas, id, reg_init);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
regulator_unregister(pmic->rdev[id]);
|
||||
goto err_unregister_regulator;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
Loading…
Reference in New Issue