projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cbf806d
)
Input: wacom - clear Intuos4 wheel data when finger leaves proximity
author
Ping Cheng
<pingc@wacom.com>
Tue, 2 Jun 2009 23:59:58 +0000
(16:59 -0700)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Wed, 3 Jun 2009 14:37:36 +0000
(07:37 -0700)
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/tablet/wacom_wac.c
patch
|
blob
|
history
diff --git
a/drivers/input/tablet/wacom_wac.c
b/drivers/input/tablet/wacom_wac.c
index
2ff8990
..
38bf863
100644
(file)
--- a/
drivers/input/tablet/wacom_wac.c
+++ b/
drivers/input/tablet/wacom_wac.c
@@
-455,6
+455,9
@@
static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
wacom_report_key(wcombo, BTN_6, (data[3] & 0x20));
if (data[1] & 0x80) {
wacom_report_abs(wcombo, ABS_WHEEL, (data[1] & 0x7f));
+ } else {
+ /* Out of proximity, clear wheel value. */
+ wacom_report_abs(wcombo, ABS_WHEEL, 0);
}
if (wacom->features->type != INTUOS4S) {
wacom_report_key(wcombo, BTN_7, (data[3] & 0x40));