diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
| commit | 0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch) | |
| tree | 64b6b9655e944284937f5eeff643f0754f35d0af /drivers/hwmon/tmp421.c | |
| parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'drivers/hwmon/tmp421.c')
| -rw-r--r-- | drivers/hwmon/tmp421.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c index 738c472ece27..6b4165c12092 100644 --- a/drivers/hwmon/tmp421.c +++ b/drivers/hwmon/tmp421.c | |||
| @@ -295,7 +295,6 @@ exit_remove: | |||
| 295 | sysfs_remove_group(&client->dev.kobj, &tmp421_group); | 295 | sysfs_remove_group(&client->dev.kobj, &tmp421_group); |
| 296 | 296 | ||
| 297 | exit_free: | 297 | exit_free: |
| 298 | i2c_set_clientdata(client, NULL); | ||
| 299 | kfree(data); | 298 | kfree(data); |
| 300 | 299 | ||
| 301 | return err; | 300 | return err; |
| @@ -308,7 +307,6 @@ static int tmp421_remove(struct i2c_client *client) | |||
| 308 | hwmon_device_unregister(data->hwmon_dev); | 307 | hwmon_device_unregister(data->hwmon_dev); |
| 309 | sysfs_remove_group(&client->dev.kobj, &tmp421_group); | 308 | sysfs_remove_group(&client->dev.kobj, &tmp421_group); |
| 310 | 309 | ||
| 311 | i2c_set_clientdata(client, NULL); | ||
| 312 | kfree(data); | 310 | kfree(data); |
| 313 | 311 | ||
| 314 | return 0; | 312 | return 0; |