[PATCH 4/4] Only report multi-touch when pen is out of range

[Jason Gerecke <killertofu@gmail.com>]

Don't bother evaluating multi-touch packets from the hardware
when the pen is in range. Single-touch is already filtered, but
not MT.

Signed-off-by: Jason Gerecke <killertofu@gmail.com>
---
 Now being sent upstream to LKML at the behest of Google.

 drivers/input/touchscreen/wacom_w8001.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
index 40ed685..393fd3c 100644
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -379,7 +379,10 @@ static irqreturn_t w8001_interrupt(struct serio *serio,
 	/* 2 finger touch packet */
 	case W8001_PKTLEN_TOUCH2FG - 1:
 		w8001->idx = 0;
-		parse_multi_touch(w8001);
+		if (w8001->type != BTN_TOOL_PEN &&
+		    w8001->type != BTN_TOOL_RUBBER) {
+			parse_multi_touch(w8001);
+		}
 		break;
 	}
 
-- 
1.7.5.2