[PATCH] I2C hwmon: kfree fixes

Mark M. Hoffman · Linus Torvalds · commit bebf4688e9db · 2005-08-26T19:37:12.000-07:00
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 &lt;mhoffman@lightlink.com&gt;
Signed-off-by: Jean Delvare &lt;khali@linux-fr.org&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@suse.de&gt;
Signed-off-by: Andrew Morton &lt;akpm@osdl.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
diff --git 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
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ int adm1026_attach_adapter(struct i2c_adapter *adapter)`
`325`	`325`	`int adm1026_detach_client(struct i2c_client *client)`
`326`	`326`	`{`
`327`	`327`	`i2c_detach_client(client);`
`328`		`- kfree(client);`
	`328`	`+ kfree(i2c_get_clientdata(client));`
`329`	`329`	`return 0;`
`330`	`330`	`}`
`331`	`331`
Original file line number	Diff line number	Diff line change
`@@ -845,7 +845,7 @@ static int adm1031_detach_client(struct i2c_client *client)`
`845`	`845`	`if ((ret = i2c_detach_client(client)) != 0) {`
`846`	`846`	`return ret;`
`847`	`847`	`}`
`848`		`- kfree(client);`
	`848`	`+ kfree(i2c_get_clientdata(client));`
`849`	`849`	`return 0;`
`850`	`850`	`}`
`851`	`851`