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/misc/eeprom/at24.c | |
| parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'drivers/misc/eeprom/at24.c')
| -rw-r--r-- | drivers/misc/eeprom/at24.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index f7ca3a42b490..559b0b3c16c3 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c | |||
| @@ -643,7 +643,6 @@ static int __devexit at24_remove(struct i2c_client *client) | |||
| 643 | 643 | ||
| 644 | kfree(at24->writebuf); | 644 | kfree(at24->writebuf); |
| 645 | kfree(at24); | 645 | kfree(at24); |
| 646 | i2c_set_clientdata(client, NULL); | ||
| 647 | return 0; | 646 | return 0; |
| 648 | } | 647 | } |
| 649 | 648 | ||