openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

regulator: Fix unbalanced lock/unlock in mc13892_regulator_probe error path 

We do not hold a lock while registering regulator, thus should not call unlock
if regulator_register fails.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2012-03-15 12:49:09 +08:00 committed by Mark Brown
parent 09bf14b901
commit 5777d9b34a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/regulator/mc13892-regulator.c
View File

@ -552,7 +552,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
mc13xxx_lock(mc13892); mc13xxx_lock(mc13892);
ret = mc13xxx_reg_read(mc13892, MC13892_REVISION, &val); ret = mc13xxx_reg_read(mc13892, MC13892_REVISION, &val);
if (ret) if (ret)
goto err_free; goto err_unlock;
/* enable switch auto mode */ /* enable switch auto mode */
if ((val & 0x0000FFFF) == 0x45d0) { if ((val & 0x0000FFFF) == 0x45d0) {
@ -562,7 +562,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
MC13892_SWITCHERS4_SW1MODE_AUTO | MC13892_SWITCHERS4_SW1MODE_AUTO |
MC13892_SWITCHERS4_SW2MODE_AUTO); MC13892_SWITCHERS4_SW2MODE_AUTO);
if (ret) if (ret)
goto err_free; goto err_unlock;
ret = mc13xxx_reg_rmw(mc13892, MC13892_SWITCHERS5, ret = mc13xxx_reg_rmw(mc13892, MC13892_SWITCHERS5,
MC13892_SWITCHERS5_SW3MODE_M | MC13892_SWITCHERS5_SW3MODE_M |
@ -570,7 +570,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
MC13892_SWITCHERS5_SW3MODE_AUTO | MC13892_SWITCHERS5_SW3MODE_AUTO |
MC13892_SWITCHERS5_SW4MODE_AUTO); MC13892_SWITCHERS5_SW4MODE_AUTO);
if (ret) if (ret)
goto err_free; goto err_unlock;
} }
mc13xxx_unlock(mc13892); mc13xxx_unlock(mc13892);
@ -612,10 +612,10 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
err: err:
while (--i >= 0) while (--i >= 0)
regulator_unregister(priv->regulators[i]); regulator_unregister(priv->regulators[i]);
return ret;
err_free: err_unlock:
mc13xxx_unlock(mc13892); mc13xxx_unlock(mc13892);
return ret; return ret;
} }