Merge commit 'v2.6.35-rc3' into for-linus

1 files changed, 0 insertions, 2 deletions

diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c
index 8013895a1faf..93187c3cb5e7 100644
--- a/drivers/hwmon/tmp102.c
+++ b/drivers/hwmon/tmp102.c
@@ -224,7 +224,6 @@ fail_remove_sysfs:
 fail_restore_config:
         tmp102_write_reg(client, TMP102_CONF_REG, tmp102->config_orig);
 fail_free:
-        i2c_set_clientdata(client, NULL);
         kfree(tmp102);
 
         return status;
@@ -247,7 +246,6 @@ static int __devexit tmp102_remove(struct i2c_client *client)
                                          config | TMP102_CONF_SD);
         }
 
-        i2c_set_clientdata(client, NULL);
         kfree(tmp102);
 
         return 0;