diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-18 10:53:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-18 10:53:19 +0200 |
| commit | 646b1db4956ba8bf748b835b5eba211133d91c2e (patch) | |
| tree | 061166d873d9da9cf83044a7593ad111787076c5 /drivers/input/keyboard/tca6416-keypad.c | |
| parent | perf session: fix error message on failure to open perf.data (diff) | |
| parent | Linux 2.6.35-rc3 (diff) | |
| download | linux-646b1db4956ba8bf748b835b5eba211133d91c2e.tar.xz linux-646b1db4956ba8bf748b835b5eba211133d91c2e.zip | |
Merge commit 'v2.6.35-rc3' into perf/core
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
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) input_unregister_device(chip->input); kfree(chip); - i2c_set_clientdata(client, NULL); - return 0; } |