diff options
Diffstat (limited to 'wacom-09-disable-bamboo-touchpad-when-pen-is-being-used.patch')
| -rw-r--r-- | wacom-09-disable-bamboo-touchpad-when-pen-is-being-used.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/wacom-09-disable-bamboo-touchpad-when-pen-is-being-used.patch b/wacom-09-disable-bamboo-touchpad-when-pen-is-being-used.patch new file mode 100644 index 000000000..e14954031 --- /dev/null +++ b/wacom-09-disable-bamboo-touchpad-when-pen-is-being-used.patch @@ -0,0 +1,31 @@ +From: Chris Bagwell <chris@cnpbagwell.com> +Date: Sun, 12 Sep 2010 07:12:28 +0000 (-0700) +Subject: Input: wacom - disable Bamboo touchpad when pen is being used +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdtor%2Finput.git;a=commitdiff_plain;h=33d5f713a19b0f5cb93e0594f7206d2730cf39da + +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> +--- + +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) { |