HID: wacom: Don't add ghost interface as shared data
A previous commit (below) adds a check for already probed interfaces to
Wacom's matching heuristic. Unfortunately this causes the Bamboo Pen
(CTL-460) to match itself to its 'ghost' touch interface. After
subsequent changes to the driver this match to the ghost causes the
kernel to crash. This patch avoids calling wacom_add_shared_data()
for the BAMBOO_PEN's ghost touch interface.
Fixes: 41372d5d40
("HID: wacom: Augment 'oVid' and 'oPid' with heuristics for HID_GENERIC")
Cc: stable <stable@vger.kernel.org> # 4.9
Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Родитель
9257821c5a
Коммит
8b40735969
|
@ -2165,6 +2165,14 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
|
|||
|
||||
wacom_update_name(wacom, wireless ? " (WL)" : "");
|
||||
|
||||
/* pen only Bamboo neither support touch nor pad */
|
||||
if ((features->type == BAMBOO_PEN) &&
|
||||
((features->device_type & WACOM_DEVICETYPE_TOUCH) ||
|
||||
(features->device_type & WACOM_DEVICETYPE_PAD))) {
|
||||
error = -ENODEV;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
error = wacom_add_shared_data(hdev);
|
||||
if (error)
|
||||
goto fail;
|
||||
|
@ -2212,14 +2220,6 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
|
|||
goto fail_quirks;
|
||||
}
|
||||
|
||||
/* pen only Bamboo neither support touch nor pad */
|
||||
if ((features->type == BAMBOO_PEN) &&
|
||||
((features->device_type & WACOM_DEVICETYPE_TOUCH) ||
|
||||
(features->device_type & WACOM_DEVICETYPE_PAD))) {
|
||||
error = -ENODEV;
|
||||
goto fail_quirks;
|
||||
}
|
||||
|
||||
if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR)
|
||||
error = hid_hw_open(hdev);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче