projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge by hand (conflicts in sr.c)
[powerpc.git]
/
drivers
/
hwmon
/
adm1026.c
diff --git
a/drivers/hwmon/adm1026.c
b/drivers/hwmon/adm1026.c
index
ded6e8a
..
c8a7f47
100644
(file)
--- a/
drivers/hwmon/adm1026.c
+++ b/
drivers/hwmon/adm1026.c
@@
-325,7
+325,7
@@
int adm1026_attach_adapter(struct i2c_adapter *adapter)
int adm1026_detach_client(struct i2c_client *client)
{
i2c_detach_client(client);
- kfree(
client
);
+ kfree(
i2c_get_clientdata(client)
);
return 0;
}