HID: wacom: don't apply generic settings to old devices
authorPing Cheng <pinglinux@gmail.com>
Tue, 4 Apr 2017 19:32:31 +0000 (19:32 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 12 Apr 2017 10:41:21 +0000 (12:41 +0200)
commit703f48a1c302f66e686535355092116ebaeccaad
treea4b6a2a78b81f34c7ef0286b51dda019f8fbdf52
parentabb640893830c7bddd0dd75ef5184c688eb94dc0
HID: wacom: don't apply generic settings to old devices

[ Upstream commit e7deb1570a527d3c74be4e21a72b1b459605c501 ]

Non-generic devices have numbered_buttons set for both pen and
touch interfaces by default. The actual number of buttons on the
interface is normally manually decided later, which is different
from what those HID generic devices are processed, where number
of buttons are directly retrieved from HID descriptors.

This patch adds the missed HID_GENERIC check and moves the statement
to wacom_setup_pad_input_capabilities since it's not a quirk anymore.

Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/hid/wacom_wac.c