From: Ping Cheng <pingc@wacom.com>
Date: Tue, 2 Jun 2009 23:59:58 +0000 (-0700)
Subject: Input: wacom - clear Intuos4 wheel data when finger leaves proximity
X-Git-Tag: v2.6.31-rc1~100^2~8
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a86295283063ce23fbefad494c71290caf8eae25;p=pandora-kernel.git

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>
---

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));