Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | Subject | [PATCH] regulator: Remove mc13xxx_unlock in regulator_register failure path | From | Axel Lin <> | Date | Tue, 03 May 2011 23:15:04 +0800 |
| |
We do not hold the mutex_lock of struct mc13xxx while calling regulator_register, Thus remove mc13xxx_unlock in regulator_register failure path.
Signed-off-by: Axel Lin <axel.lin@gmail.com> --- drivers/regulator/mc13892-regulator.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c index 1b8f739..38e805d 100644 --- a/drivers/regulator/mc13892-regulator.c +++ b/drivers/regulator/mc13892-regulator.c @@ -537,8 +537,10 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev) mc13xxx_lock(mc13892); ret = mc13xxx_reg_read(mc13892, MC13892_REVISION, &val); - if (ret) + if (ret) { + mc13xxx_unlock(mc13892); goto err_free; + } /* enable switch auto mode */ if ((val & 0x0000FFFF) == 0x45d0) { @@ -547,16 +549,20 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev) MC13892_SWITCHERS4_SW2MODE_M, MC13892_SWITCHERS4_SW1MODE_AUTO | MC13892_SWITCHERS4_SW2MODE_AUTO); - if (ret) + if (ret) { + mc13xxx_unlock(mc13892); goto err_free; + } ret = mc13xxx_reg_rmw(mc13892, MC13892_SWITCHERS5, MC13892_SWITCHERS5_SW3MODE_M | MC13892_SWITCHERS5_SW4MODE_M, MC13892_SWITCHERS5_SW3MODE_AUTO | MC13892_SWITCHERS5_SW4MODE_AUTO); - if (ret) + if (ret) { + mc13xxx_unlock(mc13892); goto err_free; + } } mc13xxx_unlock(mc13892); @@ -586,7 +592,6 @@ err: regulator_unregister(priv->regulators[i]); err_free: - mc13xxx_unlock(mc13892); kfree(priv); return ret; -- 1.7.1
| ![\](/images/icornerr.gif) |