diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
| commit | 08fa16b6b75005c120b59d00ae42a0b7cc68db45 (patch) | |
| tree | c5f22412467f72dd0c7291bbb958a9485e894f02 /drivers/input/keyboard/tca6416-keypad.c | |
| parent | 1796b983cc4cbbed5e9e478b03591609a2c21987 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into next
Diffstat (limited to 'drivers/input/keyboard/tca6416-keypad.c')
| -rw-r--r-- | drivers/input/keyboard/tca6416-keypad.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/keyboard/tca6416-keypad.c b/drivers/input/keyboard/tca6416-keypad.c index 493c93f25e2a..00137bebcf97 100644 --- a/drivers/input/keyboard/tca6416-keypad.c +++ b/drivers/input/keyboard/tca6416-keypad.c | |||
| @@ -316,8 +316,6 @@ static int __devexit tca6416_keypad_remove(struct i2c_client *client) | |||
| 316 | input_unregister_device(chip->input); | 316 | input_unregister_device(chip->input); |
| 317 | kfree(chip); | 317 | kfree(chip); |
| 318 | 318 | ||
| 319 | i2c_set_clientdata(client, NULL); | ||
| 320 | |||
| 321 | return 0; | 319 | return 0; |
| 322 | } | 320 | } |
| 323 | 321 | ||