diff options
| author | Mark M. Hoffman <mhoffman@lightlink.com> | 2005-08-26 18:34:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-26 19:37:12 -0700 |
| commit | bebf4688e9dbbfdd421736685d607bced91a3c91 (patch) | |
| tree | b88e2d0d55bbc9788337c256dfd25b54d684e49e | |
| parent | 32818c2eb6b83ea5065c89e0c3cf774abc4dc02b (diff) | |
| download | op-kernel-dev-bebf4688e9dbbfdd421736685d607bced91a3c91.zip op-kernel-dev-bebf4688e9dbbfdd421736685d607bced91a3c91.tar.gz | |
[PATCH] I2C hwmon: kfree fixes
This patch fixes several instances of hwmon drivers kfree'ing the "wrong"
pointer; the existing code works somewhat by accident.
(akpm: plucked from Greg's queue based on lkml discussion. Finishes off the
patch from Jon Corbet)
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/hwmon/adm1026.c | 2 | ||||
| -rw-r--r-- | drivers/hwmon/adm1031.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c index ded6e8a..c8a7f47 100644 --- 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; } diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c index 4211c8b..9362509 100644 --- a/drivers/hwmon/adm1031.c +++ b/drivers/hwmon/adm1031.c @@ -845,7 +845,7 @@ static int adm1031_detach_client(struct i2c_client *client) if ((ret = i2c_detach_client(client)) != 0) { return ret; } - kfree(client); + kfree(i2c_get_clientdata(client)); return 0; } |
