summaryrefslogtreecommitdiff
path: root/drivers/regulator/rc5t583-regulator.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-04-04 15:52:35 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-05 01:13:32 +0400
commita69df8a14ae7b891ee22f0e4c081f3ff65c0640f (patch)
tree0dd61511a4e0218e41ee8827e76fae8a4b948b44 /drivers/regulator/rc5t583-regulator.c
parentad9c5ffea8de1d989e205650bb46111b37498cf3 (diff)
downloadlinux-a69df8a14ae7b891ee22f0e4c081f3ff65c0640f.tar.xz
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>
Diffstat (limited to 'drivers/regulator/rc5t583-regulator.c')
-rw-r--r--drivers/regulator/rc5t583-regulator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/rc5t583-regulator.c b/drivers/regulator/rc5t583-regulator.c
index 37732f7c798d..cac8a2a4f8e6 100644
--- a/drivers/regulator/rc5t583-regulator.c
+++ b/drivers/regulator/rc5t583-regulator.c
@@ -312,7 +312,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, NULL);
- 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);
@@ -324,7 +324,7 @@ skip_ext_pwr_config:
return 0;
clean_exit:
- while (--id > 0)
+ while (--id >= 0)
regulator_unregister(regs[id].rdev);
return ret;