From 7bd88911abbdaaae24e9f879c8008abe7d34b28b Mon Sep 17 00:00:00 2001 From: Chris Bagwell Date: Wed, 26 Oct 2011 22:28:34 -0700 Subject: [PATCH] --- yaml --- r: 282362 b: refs/heads/master c: c5981411f60c31f0dff6f0f98d2d3711384badaf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/tablet/wacom_wac.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index bd3097d117c7..ed62945cddc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 428f85884bb4a88737e5fa76535ede06a33fe162 +refs/heads/master: c5981411f60c31f0dff6f0f98d2d3711384badaf diff --git a/trunk/drivers/input/tablet/wacom_wac.c b/trunk/drivers/input/tablet/wacom_wac.c index 7fefd93596ea..d1ced325939d 100644 --- a/trunk/drivers/input/tablet/wacom_wac.c +++ b/trunk/drivers/input/tablet/wacom_wac.c @@ -842,12 +842,7 @@ static int wacom_bpt_pen(struct wacom_wac *wacom) unsigned char *data = wacom->data; int prox = 0, x = 0, y = 0, p = 0, d = 0, pen = 0, btn1 = 0, btn2 = 0; - /* - * Similar to Graphire protocol, data[1] & 0x20 is proximity and - * data[1] & 0x18 is tool ID. 0x30 is safety check to ignore - * 2 unused tool ID's. - */ - prox = (data[1] & 0x30) == 0x30; + prox = (data[1] & 0x20) == 0x20; /* * All reports shared between PEN and RUBBER tool must be