From e9ed4787cc0b067375d043a3bc79fcd43a3ebe4c Mon Sep 17 00:00:00 2001 From: "Kim, Milo" Date: Fri, 31 Aug 2012 09:22:46 +0000 Subject: [PATCH] --- yaml --- r: 330499 b: refs/heads/master c: 74727c571517692ae24d0562676f2c61a86b9090 h: refs/heads/master i: 330497: fb2d2738c316ab31d9b289c381de876f4cfabfc6 330495: 27f37769c9cb46b1f9f0db4022d645497a670e5a v: v3 --- [refs] | 2 +- trunk/drivers/power/lp8727_charger.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index af9f0a6d46b0..84a8da2f1b05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2778b0fe15d7adfe65b092ae842510c6c031370 +refs/heads/master: 74727c571517692ae24d0562676f2c61a86b9090 diff --git a/trunk/drivers/power/lp8727_charger.c b/trunk/drivers/power/lp8727_charger.c index 5c56d7e46993..0d3cb1de2eb1 100644 --- a/trunk/drivers/power/lp8727_charger.c +++ b/trunk/drivers/power/lp8727_charger.c @@ -360,7 +360,7 @@ static int lp8727_register_psy(struct lp8727_chg *pchg) { struct lp8727_psy *psy; - psy = kzalloc(sizeof(*psy), GFP_KERNEL); + psy = devm_kzalloc(pchg->dev, sizeof(*psy), GFP_KERNEL); if (!psy) return -ENOMEM; @@ -405,7 +405,6 @@ static int lp8727_register_psy(struct lp8727_chg *pchg) err_psy_usb: power_supply_unregister(&psy->ac); err_psy_ac: - kfree(psy); return -EPERM; } @@ -419,7 +418,6 @@ static void lp8727_unregister_psy(struct lp8727_chg *pchg) power_supply_unregister(&psy->ac); power_supply_unregister(&psy->usb); power_supply_unregister(&psy->batt); - kfree(psy); } static int lp8727_probe(struct i2c_client *cl, const struct i2c_device_id *id) @@ -430,7 +428,7 @@ static int lp8727_probe(struct i2c_client *cl, const struct i2c_device_id *id) if (!i2c_check_functionality(cl->adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) return -EIO; - pchg = kzalloc(sizeof(*pchg), GFP_KERNEL); + pchg = devm_kzalloc(&cl->dev, sizeof(*pchg), GFP_KERNEL); if (!pchg) return -ENOMEM; @@ -462,7 +460,6 @@ static int lp8727_probe(struct i2c_client *cl, const struct i2c_device_id *id) return 0; error: - kfree(pchg); return ret; } @@ -474,7 +471,6 @@ static int __devexit lp8727_remove(struct i2c_client *cl) free_irq(pchg->client->irq, pchg); flush_workqueue(pchg->irqthread); destroy_workqueue(pchg->irqthread); - kfree(pchg); return 0; }