summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPing Cheng <pinglinux@gmail.com>2012-12-18 14:47:53 -0800
committerJason Gerecke <killertofu@gmail.com>2012-12-19 10:02:17 -0800
commit1f9bf45bdf2eb58491fa578aa6b9ce55a9c13366 (patch)
treebcdebf79cb757cafb170b5402726ddc64ff816db
parent62e5222c14cb4d282a3a285e7dd84f0ea1d00e36 (diff)
downloadxf86-input-wacom-1f9bf45bdf2eb58491fa578aa6b9ce55a9c13366.tar.gz
Assign PAD_CHANNEL to BTNChannel for all PAD tools
BTNChannel is static for all devices, not just geneic devices. Signed-off-by: Ping Cheng <pinglinux@gmail.com> Reviewed-by: Jason Gerecke <killertofu@gmail.com>
-rw-r--r--src/wcmUSB.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index 4c83cf3..3089581 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -461,11 +461,7 @@ static void usbWcmInitPadState(InputInfoPtr pInfo)
ds->device_id = PAD_DEVICE_ID;
ds->serial_num = channel;
- /* wcmBTNChannel is only used for generic PAD device
- * and it is statically assigned to PAD_CHANNEL.
- */
- if (common->wcmProtocolLevel == WCM_PROTOCOL_GENERIC)
- private->wcmBTNChannel = channel;
+ private->wcmBTNChannel = channel;
}
int usbWcmGetRanges(InputInfoPtr pInfo)