diff options
| author | Jason Gerecke <killertofu@gmail.com> | 2015-07-01 22:01:00 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2015-07-08 11:40:59 +0200 |
| commit | 9633920e5ef65f81d30f2acd642d6d1c25cf7bc7 (patch) | |
| tree | 9b07ffe888c287bdad84037603afa2041bd6cffb /drivers/hid/wacom_wac.c | |
| parent | HID: multitouch: Fix fields from pen report ID being interpreted for multitouch (diff) | |
| download | linux-9633920e5ef65f81d30f2acd642d6d1c25cf7bc7.tar.xz linux-9633920e5ef65f81d30f2acd642d6d1c25cf7bc7.zip | |
HID: wacom: Enable pad device for older Bamboo Touch tablets
Commit 862cf55 ("HID: wacom: Introduce a new WACOM_DEVICETYPE_PAD device_type")
neglected to set the WACOM_DEVICETYPE_PAD flag for older two-finger Bamboo
Touch tablets. Not only does this result in the pad device not appearing when
such a tablet is plugged in, but also causes a segfault when 'wacom_bpt_touch'
tries to send pad events. This patch adds the flag to resolve these issues.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Diffstat (limited to 'drivers/hid/wacom_wac.c')
| -rw-r--r-- | drivers/hid/wacom_wac.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 232da89f4e88..0d244239e55d 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -2213,6 +2213,9 @@ void wacom_setup_device_quirks(struct wacom *wacom) features->x_max = 4096; features->y_max = 4096; } + else if (features->pktlen == WACOM_PKGLEN_BBTOUCH) { + features->device_type |= WACOM_DEVICETYPE_PAD; + } } /* |