Skip to contentSkip to conversation

power/ds2782: fix clientdata on removal

PATCH [email protected] 1 participant 1 message Apr 1, 2010

lore
Share & tools
lore
#0 lore raw

Testamtwort

-----Ursprüngliche Nachricht-----
Von: [email protected]
Gesendet: 01.04.2010 12:27:44
An: [email protected]
Betreff: [PATCH] power/ds2782: fix clientdata on removal

Quoted 47 lines

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.

Cc Ryan Mallon <[email protected]>
Cc Hans Verkuil <[email protected]>
Cc Anton Vorontsov <[email protected]>
Cc Jean Delvare <[email protected]>

---

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(-)
drivers/power/ds2782_battery.c +0 -2
index da14f37..305d463 100644
@@ -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:

drivers/power/ds2782_battery.c +0 -1
-	i2c_set_clientdata(client, info);
	kfree(info);
fail_info:
	mutex_lock(&battery_lock);
Signature · 7 lines
1.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/