Compilation of the 2.6.36 tree was broken by commit 0201707. This
commit fixes the underlying problem and restores the ability to
compile.
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
2.6.36/wacom_sys.c | 11 +++++++++++
2.6.36/wacom_wac.c | 5 +----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/2.6.36/wacom_sys.c b/2.6.36/wacom_sys.c
index e33787d..eda6175 100644
--- a/2.6.36/wacom_sys.c
+++ b/2.6.36/wacom_sys.c
@@ -893,6 +893,17 @@ static int wacom_probe(struct usb_interface *intf, const
struct usb_device_id *i
if (error)
goto fail3;
+ /* Ignore Intuos5/Pro and Bamboo 3rd gen touch interface until
+ * BPT3 touch support backported
+ */
+ if ((features->type >= INTUOS5S && features->type <= INTUOSPL) ||
+ (features->type == BAMBOO_PT)) {
+ if (endpoint->wMaxPacketSize == WACOM_PKGLEN_BBTOUCH3) {
+ error = -ENODEV;
+ goto fail2;
+ }
+ }
+
wacom_setup_device_quirks(wacom);
strlcpy(wacom_wac->name, features->name, sizeof(wacom_wac->name));
diff --git a/2.6.36/wacom_wac.c b/2.6.36/wacom_wac.c
index d57988e..c3f27b1 100644
--- a/2.6.36/wacom_wac.c
+++ b/2.6.36/wacom_wac.c
@@ -1336,10 +1336,7 @@ void wacom_setup_device_quirks(struct wacom *wacom)
*/
if ((features->type >= INTUOS5S && features->type <= INTUOSPL) ||
(features->type == BAMBOO_PT)) {
- if (endpoint->wMaxPacketSize == WACOM_PKGLEN_BBTOUCH3) {
- error = -ENODEV;
- goto fail2;
- } else {
+ if (endpoint->wMaxPacketSize != WACOM_PKGLEN_BBTOUCH3) {
features->device_type = BTN_TOOL_PEN;
}
}
--
2.4.6
------------------------------------------------------------------------------
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
