From 024861e6a7a841b7d85517b6a5a7945dc93217b1 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 11 Apr 2012 23:05:49 +0800 Subject: [PATCH] --- yaml --- r: 302204 b: refs/heads/master c: ef6bd5a3f128254bee0b9052f3813ca3c3c82fb5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/isl6271a-regulator.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 212419a3b765..8e019a6ae73e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 276909d3599987a0ba44e1b984fde20323ff2aea +refs/heads/master: ef6bd5a3f128254bee0b9052f3813ca3c3c82fb5 diff --git a/trunk/drivers/regulator/isl6271a-regulator.c b/trunk/drivers/regulator/isl6271a-regulator.c index 863f45a18c30..60044c362eb5 100644 --- a/trunk/drivers/regulator/isl6271a-regulator.c +++ b/trunk/drivers/regulator/isl6271a-regulator.c @@ -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; }