]> git.karo-electronics.de Git - linux-beck.git/commitdiff
regulator: isl6271a-regulator: Use devm_kzalloc()
authorAxel Lin <axel.lin@gmail.com>
Wed, 11 Apr 2012 15:05:49 +0000 (23:05 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 13 Apr 2012 08:59:39 +0000 (09:59 +0100)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/isl6271a-regulator.c

index 863f45a18c30dcb1f513925a7891edc26b4dfa88..60044c362eb5003e92d84fe638b4d5a292c1b0a4 100644 (file)
@@ -148,7 +148,7 @@ static int __devinit isl6271a_probe(struct i2c_client *i2c,
        if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -EIO;
 
-       pmic = kzalloc(sizeof(struct isl_pmic), GFP_KERNEL);
+       pmic = devm_kzalloc(&i2c->dev, sizeof(struct isl_pmic), GFP_KERNEL);
        if (!pmic)
                return -ENOMEM;
 
@@ -179,8 +179,6 @@ static int __devinit isl6271a_probe(struct i2c_client *i2c,
 error:
        while (--i >= 0)
                regulator_unregister(pmic->rdev[i]);
-
-       kfree(pmic);
        return err;
 }
 
@@ -191,9 +189,6 @@ static int __devexit isl6271a_remove(struct i2c_client *i2c)
 
        for (i = 0; i < 3; i++)
                regulator_unregister(pmic->rdev[i]);
-
-       kfree(pmic);
-
        return 0;
 }