Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d6c3322 authored by Aaron Armstrong Skomra's avatar Aaron Armstrong Skomra Committed by Greg Kroah-Hartman
Browse files

HID: wacom: Don't add ghost interface as shared data 



commit 8b4073596997f2ccbf68d8e72e07b827388a4536 upstream.

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: 41372d5d ("HID: wacom: Augment 'oVid' and 'oPid' with heuristics for HID_GENERIC")
Signed-off-by: default avatarAaron Armstrong Skomra <aaron.skomra@wacom.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e5a13473

drivers/hid/wacom_sys.c

+8 −8
Original line number Diff line number Diff line
@@ -2017,6 +2017,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;
@@ -2064,14 +2072,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);