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>
This commit is contained in:
Axel Lin 2012-04-04 19:52:35 +08:00 committed by Mark Brown
parent ad9c5ffea8
commit a69df8a14a

View File

@ -312,7 +312,7 @@ static int __devinit rc5t583_regulator_probe(struct platform_device *pdev)
skip_ext_pwr_config: skip_ext_pwr_config:
rdev = regulator_register(&ri->desc, &pdev->dev, rdev = regulator_register(&ri->desc, &pdev->dev,
reg_data, reg, NULL); reg_data, reg, NULL);
if (IS_ERR_OR_NULL(rdev)) { if (IS_ERR(rdev)) {
dev_err(&pdev->dev, "Failed to register regulator %s\n", dev_err(&pdev->dev, "Failed to register regulator %s\n",
ri->desc.name); ri->desc.name);
ret = PTR_ERR(rdev); ret = PTR_ERR(rdev);
@ -324,7 +324,7 @@ static int __devinit rc5t583_regulator_probe(struct platform_device *pdev)
return 0; return 0;
clean_exit: clean_exit:
while (--id > 0) while (--id >= 0)
regulator_unregister(regs[id].rdev); regulator_unregister(regs[id].rdev);
return ret; return ret;