Commit e3ea6467 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Benjamin Tissoires
Browse files

HID: input: fix mapping for camera access keys 

Commit 9f4211bf ("HID: add mapping for camera access keys") added
mapping for the camera access keys, but unfortunately used wrong usage
codes for them. HUTRR72[1] specifies that camera access controls use 0x76,
0x077 and 0x78 usages in the consumer control page. Previously mapped 0xd5,
0xd6 and 0xd7 usages are actually defined in HUTRR64[2] as game recording
controls.

[1] https://www.usb.org/sites/default/files/hutrr72_-_usages_to_control_camera_access_0.pdf
[2] https://www.usb.org/sites/default/files/hutrr64b_-_game_recording_controllers_0.pdf



Fixes: 9f4211bf ("HID: add mapping for camera access keys")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Link: https://lore.kernel.org/r/ZJtd/fMXRUgq20TW@google.com


Signed-off-by: default avatarBenjamin Tissoires <bentiss@kernel.org>
parent a343a768

drivers/hid/hid-input.c

+4 −3
Original line number Diff line number Diff line
@@ -1093,6 +1093,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
		case 0x074: map_key_clear(KEY_BRIGHTNESS_MAX);		break;

		case 0x075: map_key_clear(KEY_BRIGHTNESS_AUTO);		break;



		case 0x076: map_key_clear(KEY_CAMERA_ACCESS_ENABLE);	break;

		case 0x077: map_key_clear(KEY_CAMERA_ACCESS_DISABLE);	break;

		case 0x078: map_key_clear(KEY_CAMERA_ACCESS_TOGGLE);	break;



		case 0x079: map_key_clear(KEY_KBDILLUMUP);	break;

		case 0x07a: map_key_clear(KEY_KBDILLUMDOWN);	break;

		case 0x07c: map_key_clear(KEY_KBDILLUMTOGGLE);	break;
@@ -1139,9 +1143,6 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
		case 0x0cd: map_key_clear(KEY_PLAYPAUSE);	break;

		case 0x0cf: map_key_clear(KEY_VOICECOMMAND);	break;



		case 0x0d5: map_key_clear(KEY_CAMERA_ACCESS_ENABLE);		break;

		case 0x0d6: map_key_clear(KEY_CAMERA_ACCESS_DISABLE);		break;

		case 0x0d7: map_key_clear(KEY_CAMERA_ACCESS_TOGGLE);		break;

		case 0x0d8: map_key_clear(KEY_DICTATE);		break;

		case 0x0d9: map_key_clear(KEY_EMOJI_PICKER);	break;