diff options
| author | Ping Cheng <pinglinux@gmail.com> | 2015-10-26 14:29:12 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-11-02 17:38:23 +0100 |
| commit | 7adb91bd78a5e00209c56068dc0ad53d4cf4348f (patch) | |
| tree | 8a4b6ed623e3cd9fe900fcd2da0638668d984f4a /drivers/hid | |
| parent | 8d515fda8946cbfb359dca9d6bd416478f1b45cc (diff) | |
| download | linux-7adb91bd78a5e00209c56068dc0ad53d4cf4348f.tar.gz linux-7adb91bd78a5e00209c56068dc0ad53d4cf4348f.tar.bz2 linux-7adb91bd78a5e00209c56068dc0ad53d4cf4348f.zip | |
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>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 2 | ||||
| -rw-r--r-- | drivers/hid/wacom_wac.c | 1 | ||||
| -rw-r--r-- | drivers/hid/wacom_wac.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 125e9d5dce38..b4de3256aa90 100644 --- 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 7b3784826cce..453da6d5c583 100644 --- 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 95ee92b807e9..d9e9515fd149 100644 --- 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, |