Commit 794c6133 authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Benjamin Tissoires
Browse files

HID: multitouch: Apply MT_QUIRK_CONFIDENCE quirk for multi-input devices 



Palm ejection stops working on some Elan and Synaptics touchpad after
commit 40d5bb87 ("HID: multitouch: enable multi-input as a quirk for
some devices").

The commit changes the mt_class from MT_CLS_WIN_8 to
MT_CLS_WIN_8_FORCE_MULTI_INPUT, so MT_QUIRK_CONFIDENCE isn't applied
anymore.

So also apply the quirk since MT_CLS_WIN_8_FORCE_MULTI_INPUT is
essentially MT_CLS_WIN_8.

Fixes: 40d5bb87 ("HID: multitouch: enable multi-input as a quirk for some devices")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent 7de843db

drivers/hid/hid-multitouch.c

+2 −1
Original line number Diff line number Diff line
@@ -758,7 +758,8 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
			MT_STORE_FIELD(inrange_state);

			return 1;

		case HID_DG_CONFIDENCE:

			if (cls->name == MT_CLS_WIN_8 &&

			if ((cls->name == MT_CLS_WIN_8 ||

			     cls->name == MT_CLS_WIN_8_FORCE_MULTI_INPUT) &&

				(field->application == HID_DG_TOUCHPAD ||

				 field->application == HID_DG_TOUCHSCREEN))

				app->quirks |= MT_QUIRK_CONFIDENCE;