diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 11:32:04 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 11:32:04 -0700 |
| commit | 0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch) | |
| tree | 64b6b9655e944284937f5eeff643f0754f35d0af /drivers/input/misc/pcf8574_keypad.c | |
| parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
| download | linux-0e789314f8c0b50bd19bf08dc5624b9604d60183.tar.gz linux-0e789314f8c0b50bd19bf08dc5624b9604d60183.tar.bz2 linux-0e789314f8c0b50bd19bf08dc5624b9604d60183.zip | |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'drivers/input/misc/pcf8574_keypad.c')
| -rw-r--r-- | drivers/input/misc/pcf8574_keypad.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/misc/pcf8574_keypad.c b/drivers/input/misc/pcf8574_keypad.c index 376e54df4763..4b42ffc0532a 100644 --- a/drivers/input/misc/pcf8574_keypad.c +++ b/drivers/input/misc/pcf8574_keypad.c @@ -168,8 +168,6 @@ static int __devexit pcf8574_kp_remove(struct i2c_client *client) input_unregister_device(lp->idev); kfree(lp); - i2c_set_clientdata(client, NULL); - return 0; } |