diff options
author | Ping Cheng <pingc@wacom.com> | 2009-06-03 01:59:58 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-06-03 16:37:36 +0200 |
commit | a86295283063ce23fbefad494c71290caf8eae25 (patch) | |
tree | 9a4f806abde6b012f48b1123e44d533154692e01 /drivers/input/tablet | |
parent | Input: ucb1400 - move static function from header into core (diff) | |
download | linux-a86295283063ce23fbefad494c71290caf8eae25.tar.xz linux-a86295283063ce23fbefad494c71290caf8eae25.zip |
Input: wacom - clear Intuos4 wheel data when finger leaves proximity
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/tablet')
-rw-r--r-- | drivers/input/tablet/wacom_wac.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 2ff89904f26f..38bf86384aeb 100644 --- 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)); |