Commit 9327e3ee authored by Iusico Maxim's avatar Iusico Maxim Committed by Jiri Kosina
Browse files

HID: lenovo: Restrict F7/9/11 mode to compact keyboards only 



Commit 2f2bd7cb ("hid: lenovo: Resend all settings on reset_resume
for compact keyboards") introduced a regression for ThinkPad TrackPoint
Keyboard II by removing the conditional check for enabling F7/9/11 mode
needed for compact keyboards only. As a result, the non-compact
keyboards can no longer toggle Fn-lock via Fn+Esc, although it can be
controlled via sysfs knob that directly sends raw commands.

This patch restores the previous conditional check without any
additions.

Cc: stable@vger.kernel.org
Fixes: 2f2bd7cb ("hid: lenovo: Resend all settings on reset_resume for compact keyboards")
Signed-off-by: default avatarIusico Maxim <iusico.maxim@libero.it>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent 1a8953f4

drivers/hid/hid-lenovo.c

+7 −4
Original line number Diff line number Diff line
@@ -548,11 +548,14 @@ static void lenovo_features_set_cptkbd(struct hid_device *hdev) 


	/*

	 * Tell the keyboard a driver understands it, and turn F7, F9, F11 into

	 * regular keys

	 * regular keys (Compact only)

	 */

	if (hdev->product == USB_DEVICE_ID_LENOVO_CUSBKBD ||

	    hdev->product == USB_DEVICE_ID_LENOVO_CBTKBD) {

		ret = lenovo_send_cmd_cptkbd(hdev, 0x01, 0x03);

		if (ret)

			hid_warn(hdev, "Failed to switch F7/9/11 mode: %d\n", ret);

	}



	/* Switch middle button to native mode */

	ret = lenovo_send_cmd_cptkbd(hdev, 0x09, 0x01);