aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorChris Bagwell <chris@cnpbagwell.com>2010-09-12 00:12:28 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-09-12 00:13:38 -0700
commit33d5f713a19b0f5cb93e0594f7206d2730cf39da (patch)
treea905f72db302f6dfd114a0e83325b844d6e06120 /drivers
parent2aaacb153689dbe9064e4db7e9d00de0edfc1fa0 (diff)
downloadkernel_samsung_tuna-33d5f713a19b0f5cb93e0594f7206d2730cf39da.zip
kernel_samsung_tuna-33d5f713a19b0f5cb93e0594f7206d2730cf39da.tar.gz
kernel_samsung_tuna-33d5f713a19b0f5cb93e0594f7206d2730cf39da.tar.bz2
Input: wacom - disable Bamboo touchpad when pen is being used
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com> Acked-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/tablet/wacom_wac.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 536156b..e1b65ba 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -866,7 +866,13 @@ static int wacom_bpt_touch(struct wacom_wac *wacom)
for (i = 0; i < 2; i++) {
int p = data[9 * i + 2];
input_mt_slot(input, i);
- if (p) {
+ /*
+ * Touch events need to be disabled while stylus is
+ * in proximity because user's hand is resting on touchpad
+ * and sending unwanted events. User expects tablet buttons
+ * to continue working though.
+ */
+ if (p && !wacom->shared->stylus_in_proximity) {
int x = get_unaligned_be16(&data[9 * i + 3]) & 0x7ff;
int y = get_unaligned_be16(&data[9 * i + 5]) & 0x7ff;
if (features->quirks & WACOM_QUIRK_BBTOUCH_LOWRES) {