summaryrefslogtreecommitdiff
path: root/drivers/input/keyboard/qt2160.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-06-22 22:32:04 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-06-22 22:32:04 +0400
commit0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch)
tree64b6b9655e944284937f5eeff643f0754f35d0af /drivers/input/keyboard/qt2160.c
parentf5dec51172b81db226a23f309bc737ad021af35b (diff)
parent7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff)
downloadlinux-0e789314f8c0b50bd19bf08dc5624b9604d60183.tar.xz
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'drivers/input/keyboard/qt2160.c')
-rw-r--r--drivers/input/keyboard/qt2160.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/keyboard/qt2160.c b/drivers/input/keyboard/qt2160.c
index 31f30087b591..fac695157e8a 100644
--- a/drivers/input/keyboard/qt2160.c
+++ b/drivers/input/keyboard/qt2160.c
@@ -358,7 +358,6 @@ static int __devexit qt2160_remove(struct i2c_client *client)
input_unregister_device(qt2160->input);
kfree(qt2160);
- i2c_set_clientdata(client, NULL);
return 0;
}