Messages in this thread Patch in this message | | | From | Wolfram Sang <> | Date | Thu, 1 Apr 2010 12:27:44 +0200 | Subject | [PATCH] power/ds2782: fix clientdata on removal |
| |
Probably due to a copy & paste bug, clientdata was set again to the data structure (which is freed immediately afterwards) when it should be NULLed. Just remove the calls as the i2c-core does this automatically now.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Ryan Mallon <ryan@bluewatersys.com> Cc: Hans Verkuil <hverkuil@xs4all.nl> Cc: Anton Vorontsov <cbouatmailru@gmail.com> Cc: Jean Delvare <khali@linux-fr.org> ---
Anton: If it is okay with you, I think this should go via the I2C-tree to ensure it comes after the needed modification of the i2c-core.
drivers/power/ds2782_battery.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c index da14f37..305d463 100644 --- a/drivers/power/ds2782_battery.c +++ b/drivers/power/ds2782_battery.c @@ -236,8 +236,6 @@ static int ds2782_battery_remove(struct i2c_client *client) idr_remove(&battery_id, info->id); mutex_unlock(&battery_lock); - i2c_set_clientdata(client, info); - kfree(info); return 0; } @@ -289,7 +287,6 @@ static int ds2782_battery_probe(struct i2c_client *client, fail_register: kfree(info->battery.name); fail_name: - i2c_set_clientdata(client, info); kfree(info); fail_info: mutex_lock(&battery_lock); -- 1.7.0
| |