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/asc7621.c | |
| parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'drivers/hwmon/asc7621.c')
| -rw-r--r-- | drivers/hwmon/asc7621.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hwmon/asc7621.c b/drivers/hwmon/asc7621.c index 0f388adc6187..3b973f30b1f6 100644 --- a/drivers/hwmon/asc7621.c +++ b/drivers/hwmon/asc7621.c | |||
| @@ -1141,7 +1141,6 @@ exit_remove: | |||
| 1141 | &(asc7621_params[i].sda.dev_attr)); | 1141 | &(asc7621_params[i].sda.dev_attr)); |
| 1142 | } | 1142 | } |
| 1143 | 1143 | ||
| 1144 | i2c_set_clientdata(client, NULL); | ||
| 1145 | kfree(data); | 1144 | kfree(data); |
| 1146 | return err; | 1145 | return err; |
| 1147 | } | 1146 | } |
| @@ -1196,7 +1195,6 @@ static int asc7621_remove(struct i2c_client *client) | |||
| 1196 | &(asc7621_params[i].sda.dev_attr)); | 1195 | &(asc7621_params[i].sda.dev_attr)); |
| 1197 | } | 1196 | } |
| 1198 | 1197 | ||
| 1199 | i2c_set_clientdata(client, NULL); | ||
| 1200 | kfree(data); | 1198 | kfree(data); |
| 1201 | return 0; | 1199 | return 0; |
| 1202 | } | 1200 | } |