From 4a3edaad3180219b30025a6776e1030c391ae688 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Sat, 5 Jan 2013 23:53:25 -0500 Subject: [PATCH] --- yaml --- r: 350608 b: refs/heads/master c: 00edfc65c2ce7d039ea45f1b3cc120db01ddcce9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/power/max17040_battery.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 594b2505cd04..715702880e21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5c2b14cb2b9b6a099e22f39ae2196a8403994e9 +refs/heads/master: 00edfc65c2ce7d039ea45f1b3cc120db01ddcce9 diff --git a/trunk/drivers/power/max17040_battery.c b/trunk/drivers/power/max17040_battery.c index 22cfe9cc4727..74a0bd9bc162 100644 --- a/trunk/drivers/power/max17040_battery.c +++ b/trunk/drivers/power/max17040_battery.c @@ -207,7 +207,7 @@ static int max17040_probe(struct i2c_client *client, if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE)) return -EIO; - chip = kzalloc(sizeof(*chip), GFP_KERNEL); + chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL); if (!chip) return -ENOMEM; @@ -225,7 +225,6 @@ static int max17040_probe(struct i2c_client *client, ret = power_supply_register(&client->dev, &chip->battery); if (ret) { dev_err(&client->dev, "failed: power supply register\n"); - kfree(chip); return ret; } @@ -244,7 +243,6 @@ static int max17040_remove(struct i2c_client *client) power_supply_unregister(&chip->battery); cancel_delayed_work(&chip->work); - kfree(chip); return 0; }