git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
drivers
/
macintosh
/
therm_adt746x.c
diff --git
a/drivers/macintosh/therm_adt746x.c
b/drivers/macintosh/therm_adt746x.c
index
16d82f1
..
c42eeb4
100644
(file)
--- a/
drivers/macintosh/therm_adt746x.c
+++ b/
drivers/macintosh/therm_adt746x.c
@@
-182,7
+182,6
@@
remove_thermostat(struct i2c_client *client)
thermostat = NULL;
- i2c_set_clientdata(client, NULL);
kfree(th);
return 0;
@@
-400,7
+399,6
@@
static int probe_thermostat(struct i2c_client *client,
rc = read_reg(th, CONFIG_REG);
if (rc < 0) {
dev_err(&client->dev, "Thermostat failed to read config!\n");
- i2c_set_clientdata(client, NULL);
kfree(th);
return -ENODEV;
}