diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2010-03-20 00:12:50 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-04-07 04:00:46 -0400 |
commit | 7429b3842cfb2b8ef5d333d8f680d80f8f7c787f (patch) | |
tree | 978cf3d94918070f5e6303d1aad233b3b4e57cd3 /drivers/macintosh | |
parent | 21dbeb91a24d867af0e98ba155bfa80d2906344f (diff) |
powerpc/pmac: Fix dangling pointers
Fix I2C-drivers which missed setting clientdata to NULL before freeing the
structure it points to. Also fix drivers which do this _after_ the structure
was freed already.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Colin Leroy <colin@colino.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/therm_adt746x.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index c42eeb43042d..16d82f17ae82 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c | |||
@@ -182,6 +182,7 @@ remove_thermostat(struct i2c_client *client) | |||
182 | 182 | ||
183 | thermostat = NULL; | 183 | thermostat = NULL; |
184 | 184 | ||
185 | i2c_set_clientdata(client, NULL); | ||
185 | kfree(th); | 186 | kfree(th); |
186 | 187 | ||
187 | return 0; | 188 | return 0; |
@@ -399,6 +400,7 @@ static int probe_thermostat(struct i2c_client *client, | |||
399 | rc = read_reg(th, CONFIG_REG); | 400 | rc = read_reg(th, CONFIG_REG); |
400 | if (rc < 0) { | 401 | if (rc < 0) { |
401 | dev_err(&client->dev, "Thermostat failed to read config!\n"); | 402 | dev_err(&client->dev, "Thermostat failed to read config!\n"); |
403 | i2c_set_clientdata(client, NULL); | ||
402 | kfree(th); | 404 | kfree(th); |
403 | return -ENODEV; | 405 | return -ENODEV; |
404 | } | 406 | } |