aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/pcf8574_keypad.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-06-22 11:32:04 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-06-22 11:32:04 -0700
commit0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch)
tree64b6b9655e944284937f5eeff643f0754f35d0af /drivers/input/misc/pcf8574_keypad.c
parentInput: sysrq - fix "stuck" SysRq mode (diff)
parentLinux 2.6.35-rc3 (diff)
downloadlinux-dev-0e789314f8c0b50bd19bf08dc5624b9604d60183.tar.xz
linux-dev-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.c2
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;
}