HID: wacom: fix Intuos wireless report id issue

Intuos Pen in wireless mode does not have the same report id (2) as
when it is in USB mode (17).

This patch also moves WIRELESS next to REMOTE in type enum so we
can group devices with similar features easily.

Reported-by: Dale Brewe <dlbrewe@hotmail.com>
Tested-by: Dale Brewe <dlbrewe@hotmail.com>
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 125e9d5dce383cf3a43ed43e767df44b40a90251..b4de3256aa906d5de96bdafa06a32fef1c12bcd0 100644 (file)
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -432,7 +432,7 @@ static int wacom_query_tablet_data(struct hid_device *hdev,
                        return wacom_set_device_mode(hdev, 2, 2, 2);
                }
        } else if (features->device_type & WACOM_DEVICETYPE_PEN) {
-               if (features->type <= BAMBOO_PT && features->type != WIRELESS) {
+               if (features->type <= BAMBOO_PT) {
                        return wacom_set_device_mode(hdev, 2, 2, 2);
                }
        }

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 7b3784826cce920f3d3e1697f9302f12bb028b38..453da6d5c58347189626faf863b12ae8c694c24d 100644 (file)
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -2066,7 +2066,6 @@ static int wacom_bpt_irq(struct wacom_wac *wacom, size_t len)
        struct wacom_features *features = &wacom->features;
 
        if ((features->type == INTUOSHT2) &&
-           (wacom->data[0] == WACOM_REPORT_INTUOS_PEN) &&
            (features->device_type & WACOM_DEVICETYPE_PEN))
                return wacom_intuos_irq(wacom);
        else if (len == WACOM_PKGLEN_BBTOUCH)

diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index 95ee92b807e9c0d7cd345d6d410db3a9befad4e4..d9e9515fd14999f4241d707983846d43e486d749 100644 (file)
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -129,7 +129,6 @@ enum {
        WACOM_BEE,
        WACOM_13HD,
        WACOM_MO,
-       WIRELESS,
        BAMBOO_PEN,
        INTUOSHT,
        INTUOSHT2,
@@ -138,6 +137,7 @@ enum {
        WACOM_24HDT,
        WACOM_27QHDT,
        BAMBOO_PAD,
+       WIRELESS,
        REMOTE,
        TABLETPC,   /* add new TPC below */
        TABLETPCE,