regulator: Fix rc5t583_regulator_probe error handling
Axel Lin [Wed, 4 Apr 2012 11:52:35 +0000 (19:52 +0800)]
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>

drivers/regulator/rc5t583-regulator.c

index a665804..c2c543c 100644 (file)
@@ -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;