regulator: max8952 - fix max8952_pmic_probe error path
authorAxel Lin <axel.lin@gmail.com>
Mon, 25 Oct 2010 02:11:07 +0000 (10:11 +0800)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Thu, 28 Oct 2010 21:40:32 +0000 (22:40 +0100)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
drivers/regulator/max8952.c

index f2af0b1c3925f3c648f90e7a7e717ef6d0be5d0f..7d6aacf5c49374ae46ed7f391a668f955ac6708b 100644 (file)
@@ -212,9 +212,11 @@ static int __devinit max8952_pmic_probe(struct i2c_client *client,
        max8952->rdev = regulator_register(&regulator, max8952->dev,
                        &pdata->reg_data, max8952);
 
-       ret = IS_ERR(max8952->rdev);
-       if (ret)
+       if (IS_ERR(max8952->rdev)) {
+               ret = PTR_ERR(max8952->rdev);
                dev_err(max8952->dev, "regulator init failed (%d)\n", ret);
+               goto err_reg;
+       }
 
        max8952->en = !!(pdata->reg_data.constraints.boot_on);
        max8952->vid0 = (pdata->default_mode % 2) == 1;
@@ -309,6 +311,10 @@ static int __devinit max8952_pmic_probe(struct i2c_client *client,
 
        i2c_set_clientdata(client, max8952);
 
+       return 0;
+
+err_reg:
+       kfree(max8952);
        return ret;
 }