diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-04-04 07:52:35 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-04 17:13:32 -0400 |
commit | a69df8a14ae7b891ee22f0e4c081f3ff65c0640f (patch) | |
tree | 0dd61511a4e0218e41ee8827e76fae8a4b948b44 | |
parent | ad9c5ffea8de1d989e205650bb46111b37498cf3 (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>
-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 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) | |||
312 | skip_ext_pwr_config: | 312 | skip_ext_pwr_config: |
313 | rdev = regulator_register(&ri->desc, &pdev->dev, | 313 | rdev = regulator_register(&ri->desc, &pdev->dev, |
314 | reg_data, reg, NULL); | 314 | reg_data, reg, NULL); |
315 | if (IS_ERR_OR_NULL(rdev)) { | 315 | if (IS_ERR(rdev)) { |
316 | dev_err(&pdev->dev, "Failed to register regulator %s\n", | 316 | dev_err(&pdev->dev, "Failed to register regulator %s\n", |
317 | ri->desc.name); | 317 | ri->desc.name); |
318 | ret = PTR_ERR(rdev); | 318 | ret = PTR_ERR(rdev); |
@@ -324,7 +324,7 @@ skip_ext_pwr_config: | |||
324 | return 0; | 324 | return 0; |
325 | 325 | ||
326 | clean_exit: | 326 | clean_exit: |
327 | while (--id > 0) | 327 | while (--id >= 0) |
328 | regulator_unregister(regs[id].rdev); | 328 | regulator_unregister(regs[id].rdev); |
329 | 329 | ||
330 | return ret; | 330 | return ret; |