From 2f2c67da52722cce23e58ec1c7ddaf670ace715f Mon Sep 17 00:00:00 2001 From: Tyler Wang Date: Tue, 30 Jul 2024 20:43:01 +0800 Subject: [PATCH] acpi/acpigen_ps2_keybd: Fix total keymap size calculation This patch move keymap size calculation inside of has_alpha_num_punct_keys condition. When the condition is not met, it can prevent total keymaps size calculate incorrectly. BUG=none TEST=emerge coreboot pass Change-Id: I3dcf31d89924c1a8f2768e42065761b361e9ca41 Signed-off-by: Tyler Wang Reviewed-on: https://review.coreboot.org/c/coreboot/+/83694 Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik --- src/acpi/acpigen_ps2_keybd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/acpi/acpigen_ps2_keybd.c b/src/acpi/acpigen_ps2_keybd.c index 869120714c..75e0b73bac 100644 --- a/src/acpi/acpigen_ps2_keybd.c +++ b/src/acpi/acpigen_ps2_keybd.c @@ -287,9 +287,10 @@ static void ssdt_generate_keymap(struct acpi_dp *dp, uint8_t num_top_row_keys, keymap = rest_of_keymaps[i]; acpi_dp_add_integer(dp_array, NULL, keymap); } + + total += ARRAY_SIZE(rest_of_keymaps); } - total += ARRAY_SIZE(rest_of_keymaps); printk(BIOS_INFO, "PS2K: Passing %u keymaps to kernel\n", total); acpi_dp_add_array(dp, dp_array);