HID: quirks: Fix keyboard + touchpad on Toshiba Click Mini not working (edfc3722) · Commits · 戴 / test

The Toshiba Click Mini uses an i2c attached keyboard/touchpad combo (single i2c_hid device for both) which has a vid:pid of 04F3:0401, which is also used by a bunch of Elan touchpads which are handled by the drivers/input/mouse/elan_i2c driver, but that driver deals with pure touchpads and does not work for a combo device such as the one on the Toshiba Click Mini. The combo on the Mini has an ACPI id of ELAN0800, which is not claimed by the elan_i2c driver, so check for that and if it is found do not ignore the device. This fixes the keyboard/touchpad combo on the Mini not working (although with the touchpad in mouse emulation mode). Cc: stable@vger.kernel.org Signed-off-by:

Hans de Goede <hdegoede@redhat.com> Signed-off-by:

Jiri Kosina <jkosina@suse.cz>

drivers/hid/hid-quirks.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -730,7 +730,6 @@ static const struct hid_device_id hid_ignore_list[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },
		{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0400) },
		{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0401) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) },
		@@ -998,6 +997,17 @@ bool hid_ignore(struct hid_device *hdev)
		strncmp(hdev->name, "www.masterkit.ru MA901", 22) == 0)
		return true;
		break;
		case USB_VENDOR_ID_ELAN:
		/*
		* Many Elan devices have a product id of 0x0401 and are handled
		* by the elan_i2c input driver. But the ACPI HID ELAN0800 dev
		* is not (and cannot be) handled by that driver ->
		* Ignore all 0x0401 devs except for the ELAN0800 dev.
		*/
		if (hdev->product == 0x0401 &&
		strncmp(hdev->name, "ELAN0800", 8) != 0)
		return true;
		break;
		}

		if (hdev->type == HID_TYPE_USBMOUSE &&

Admin message