Skip to content

Commit e3ea646

Browse files
dtorBenjamin Tissoires
authored andcommitted
HID: input: fix mapping for camera access keys
Commit 9f4211b ("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: 9f4211b ("HID: add mapping for camera access keys") Cc: [email protected] Signed-off-by: Dmitry Torokhov <[email protected]> Link: https://lore.kernel.org/r/ZJtd/[email protected] Signed-off-by: Benjamin Tissoires <[email protected]>
1 parent a343a76 commit e3ea646

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/hid/hid-input.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
10931093
case 0x074: map_key_clear(KEY_BRIGHTNESS_MAX); break;
10941094
case 0x075: map_key_clear(KEY_BRIGHTNESS_AUTO); break;
10951095

1096+
case 0x076: map_key_clear(KEY_CAMERA_ACCESS_ENABLE); break;
1097+
case 0x077: map_key_clear(KEY_CAMERA_ACCESS_DISABLE); break;
1098+
case 0x078: map_key_clear(KEY_CAMERA_ACCESS_TOGGLE); break;
1099+
10961100
case 0x079: map_key_clear(KEY_KBDILLUMUP); break;
10971101
case 0x07a: map_key_clear(KEY_KBDILLUMDOWN); break;
10981102
case 0x07c: map_key_clear(KEY_KBDILLUMTOGGLE); break;
@@ -1139,9 +1143,6 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
11391143
case 0x0cd: map_key_clear(KEY_PLAYPAUSE); break;
11401144
case 0x0cf: map_key_clear(KEY_VOICECOMMAND); break;
11411145

1142-
case 0x0d5: map_key_clear(KEY_CAMERA_ACCESS_ENABLE); break;
1143-
case 0x0d6: map_key_clear(KEY_CAMERA_ACCESS_DISABLE); break;
1144-
case 0x0d7: map_key_clear(KEY_CAMERA_ACCESS_TOGGLE); break;
11451146
case 0x0d8: map_key_clear(KEY_DICTATE); break;
11461147
case 0x0d9: map_key_clear(KEY_EMOJI_PICKER); break;
11471148

0 commit comments

Comments
 (0)