Message ID | 1435780860-3647-1-git-send-email-killertofu@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Delegated to: | Jiri Kosina |
Headers | show |
On Wed, 1 Jul 2015, Jason Gerecke wrote: > Commit 862cf55 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> Applied to for-4.2/upstream-fixes.
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 232da89..0d24423 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; + } } /*
Commit 862cf55 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> --- drivers/hid/wacom_wac.c | 3 +++ 1 file changed, 3 insertions(+)