diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-04-04 19:52:35 +0800 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-06-03 08:08:36 -0700 |
| commit | 7380f01e1d2d665f8ffc7656320cb53475d84a24 (patch) | |
| tree | 40be070e510b3a149cd89136c244e4e95cef04cd | |
| parent | 70b58068435b0801e4c15742c7c758c3cb9b6e52 (diff) | |
regulator: Fix rc5t583_regulator_probe error handling
1. regulator_register returns ERR_PTR on error, thus use IS_ERR to check the
return value.
2. Fix off-by-one for unregistering the registered regulator.
Current code does not unregister regs[0].rdev in clean_exit.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
(cherry picked from commit a69df8a14ae7b891ee22f0e4c081f3ff65c0640f)
Change-Id: Ib5e00e655020e313c73e5b838e62dbdea54c28d0
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/105881
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
| -rw-r--r-- | drivers/regulator/rc5t583-regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/rc5t583-regulator.c b/drivers/regulator/rc5t583-regulator.c index a665804a31bd..c2c543c3a278 100644 --- a/drivers/regulator/rc5t583-regulator.c +++ b/drivers/regulator/rc5t583-regulator.c @@ -311,7 +311,7 @@ static int __devinit rc5t583_regulator_probe(struct platform_device *pdev) skip_ext_pwr_config: rdev = regulator_register(&ri->desc, &pdev->dev, reg_data, reg); - if (IS_ERR_OR_NULL(rdev)) { + if (IS_ERR(rdev)) { dev_err(&pdev->dev, "Failed to register regulator %s\n", ri->desc.name); ret = PTR_ERR(rdev); @@ -323,7 +323,7 @@ skip_ext_pwr_config: return 0; clean_exit: - while (--id > 0) + while (--id >= 0) regulator_unregister(regs[id].rdev); return ret; |