44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From: Chris Bagwell <chris@cnpbagwell.com>
|
|
Date: Wed, 26 Oct 2011 22:26:16 -0700
|
|
Subject: Input: wacom - remove unused bamboo HID parsing
|
|
|
|
commit fc72bf758f943fbc5c0d9dd14575b91996513c77 upstream.
|
|
|
|
Bamboo's do not declared a Digitizer-Stylus so the if() was
|
|
never executed. wacom_features already contains correct stylus
|
|
packet length.
|
|
|
|
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
|
|
Acked-by: Ping Cheng <pingc@wacom.com>
|
|
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
|
|
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
|
|
---
|
|
drivers/input/tablet/wacom_sys.c | 4 ----
|
|
1 file changed, 4 deletions(-)
|
|
|
|
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
|
|
index 8669096a8ea1..f3dfb827437a 100644
|
|
--- a/drivers/input/tablet/wacom_sys.c
|
|
+++ b/drivers/input/tablet/wacom_sys.c
|
|
@@ -245,8 +245,6 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi
|
|
/* penabled only accepts exact bytes of data */
|
|
if (features->type == TABLETPC2FG)
|
|
features->pktlen = WACOM_PKGLEN_GRAPHIRE;
|
|
- if (features->type == BAMBOO_PT)
|
|
- features->pktlen = WACOM_PKGLEN_BBFUN;
|
|
features->device_type = BTN_TOOL_PEN;
|
|
features->x_max =
|
|
get_unaligned_le16(&report[i + 3]);
|
|
@@ -288,8 +286,6 @@ static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hi
|
|
/* penabled only accepts exact bytes of data */
|
|
if (features->type == TABLETPC2FG)
|
|
features->pktlen = WACOM_PKGLEN_GRAPHIRE;
|
|
- if (features->type == BAMBOO_PT)
|
|
- features->pktlen = WACOM_PKGLEN_BBFUN;
|
|
features->device_type = BTN_TOOL_PEN;
|
|
features->y_max =
|
|
get_unaligned_le16(&report[i + 3]);
|
|
--
|
|
1.7.10.1
|
|
|