]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
regulator: Fix rc5t583_regulator_probe error handling
authorAxel Lin <axel.lin@gmail.com>
Wed, 4 Apr 2012 11:52:35 +0000 (19:52 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 4 Apr 2012 21:13:32 +0000 (22:13 +0100)
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>
drivers/regulator/rc5t583-regulator.c

index 37732f7c798d3c5258451fa014d9deccb8c3e8d3..cac8a2a4f8e600b7c98450b5aa849ce5bcbbd259 100644 (file)
@@ -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;