From dc3ff89e121a04203a744ecf9bfb9a5c21cbcd18 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 27 Mar 2012 10:09:42 +0800 Subject: [PATCH] --- yaml --- r: 302133 b: refs/heads/master c: 0df8c96fa1c1adb23c49124685dde77b6560bef2 h: refs/heads/master i: 302131: c11dff1f91be318426bebbacdee1ad01ed89f350 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/ad5398.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dee381afc985..23d6ea32a16f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 935c14a216c1afa855678e200607e98cc8cc2c51 +refs/heads/master: 0df8c96fa1c1adb23c49124685dde77b6560bef2 diff --git a/trunk/drivers/regulator/ad5398.c b/trunk/drivers/regulator/ad5398.c index ed587987f445..7d51793a072a 100644 --- a/trunk/drivers/regulator/ad5398.c +++ b/trunk/drivers/regulator/ad5398.c @@ -220,7 +220,7 @@ static int __devinit ad5398_probe(struct i2c_client *client, if (!init_data) return -EINVAL; - chip = kzalloc(sizeof(*chip), GFP_KERNEL); + chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); if (!chip) return -ENOMEM; @@ -246,7 +246,6 @@ static int __devinit ad5398_probe(struct i2c_client *client, return 0; err: - kfree(chip); return ret; } @@ -255,8 +254,6 @@ static int __devexit ad5398_remove(struct i2c_client *client) struct ad5398_chip_info *chip = i2c_get_clientdata(client); regulator_unregister(chip->rdev); - kfree(chip); - return 0; }