[Linuxwacom-devel] [PATCH input-wacom] backport: Fix parsing of contact_id for Intuos Pro 2

[Aaron Armstrong Skomra]

Signed-off-by: Aaron Armstrong Skomra <***@wacom.com>
---
2.6.30/wacom_wac.c | 2 +-
2.6.36/wacom_wac.c | 2 +-
2.6.38/wacom_wac.c | 2 +-
3.7/wacom_wac.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index c461e9a..78cd7b7 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -1140,7 +1140,7 @@ static int wacom_multitouch_generic(struct wacom_wac *wacom)

case INTUOSP2:
offset = WACOM_BYTES_PER_INTUOSP2_PACKET * i + 2;
- contact_id = data[offset] & 0x01;
+ contact_id = data[offset];
prox = data[offset + 1] & 0x01;
x = get_unaligned_le16(&data[offset + 2]);
y = get_unaligned_le16(&data[offset + 4]);
diff --git a/2.6.36/wacom_wac.c b/2.6.36/wacom_wac.c
index d52359c..c80862d 100644
--- a/2.6.36/wacom_wac.c
+++ b/2.6.36/wacom_wac.c
@@ -1296,7 +1296,7 @@ static int wacom_multitouch_generic(struct wacom_wac *wacom)

case INTUOSP2:
offset = WACOM_BYTES_PER_INTUOSP2_PACKET * i + 2;
- contact_id = data[offset] & 0x01;
+ contact_id = data[offset];
prox = data[offset + 1] & 0x01;
x = get_unaligned_le16(&data[offset + 2]);
y = get_unaligned_le16(&data[offset + 4]);
diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
index 9c0eb57..efd7f71 100644
--- a/2.6.38/wacom_wac.c
+++ b/2.6.38/wacom_wac.c
@@ -1177,7 +1177,7 @@ static int wacom_multitouch_generic(struct wacom_wac *wacom)

case INTUOSP2:
offset = WACOM_BYTES_PER_INTUOSP2_PACKET * i + 2;
- contact_id = data[offset] & 0x01;
+ contact_id = data[offset];
prox = data[offset + 1] & 0x01;
x = get_unaligned_le16(&data[offset + 2]);
y = get_unaligned_le16(&data[offset + 4]);
diff --git a/3.7/wacom_wac.c b/3.7/wacom_wac.c
index 3547241..5857d0f 100644
--- a/3.7/wacom_wac.c
+++ b/3.7/wacom_wac.c
@@ -1157,7 +1157,7 @@ static int wacom_multitouch_generic(struct wacom_wac *wacom)

case INTUOSP2:
offset = WACOM_BYTES_PER_INTUOSP2_PACKET * i + 2;
- contact_id = data[offset] & 0x01;
+ contact_id = data[offset];
prox = data[offset + 1] & 0x01;
x = get_unaligned_le16(&data[offset + 2]);
y = get_unaligned_le16(&data[offset + 4]);