HID: apple: Do not reset quirks when the Fn key is not found

JoseExposito · gregkh · commit 02191c9fb0fa · 2022-01-27T08:47:36.000+01:00
[ Upstream commit a5fe786 ] When a keyboard without a function key is detected, instead of removing all quirks, remove only the APPLE_HAS_FN quirk. Signed-off-by: José Expósito <jose.exposito89@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
@@ -390,7 +390,7 @@ static int apple_input_configured(struct hid_device *hdev,
 
 	if ((asc->quirks & APPLE_HAS_FN) && !asc->fn_found) {
 		hid_info(hdev, "Fn key not found (Apple Wireless Keyboard clone?), disabling Fn key handling\n");
-		asc->quirks = 0;
+		asc->quirks &= ~APPLE_HAS_FN;
 	}
 
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ static int apple_input_configured(struct hid_device *hdev,`
`390`	`390`
`391`	`391`	`if ((asc->quirks & APPLE_HAS_FN) && !asc->fn_found) {`
`392`	`392`	`hid_info(hdev, "Fn key not found (Apple Wireless Keyboard clone?), disabling Fn key handling\n");`
`393`		`- asc->quirks = 0;`
	`393`	`+ asc->quirks &= ~APPLE_HAS_FN;`
`394`	`394`	`}`
`395`	`395`
`396`	`396`	`return 0;`