Merge commit 'v2.6.35-rc3' into for-linus

[linux-drm-fsl-dcu.git] / drivers / input / misc / pcf8574_keypad.c

diff --git a/drivers/input/misc/pcf8574_keypad.c b/drivers/input/misc/pcf8574_keypad.c
index 376e54df4763b1eadfd9eb6b20814ffa3671bb99..4b42ffc0532af1c6a3b36ca64ab411decfac89d9 100644 (file)
--- 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;
 }