From: Dennis Bonke Date: Thu, 14 Sep 2023 13:03:56 +0000 (+0200) Subject: platform/x86: thinkpad_acpi: Take mutex in hotkey_resume X-Git-Tag: v6.6.17~3687^2~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81bf4a4e9cb754e957ab614cde6a3b16244d670b;p=platform%2Fkernel%2Flinux-rpi.git platform/x86: thinkpad_acpi: Take mutex in hotkey_resume hotkey_status_set expects the hotkey_mutex to be held. It seems like it was missed here and that gives lockdep warnings while resuming. Fixes: 38831eaf7d4c ("platform/x86: thinkpad_acpi: use lockdep annotations") Reviewed-by: Thomas Weißschuh Signed-off-by: Dennis Bonke Link: https://lore.kernel.org/r/20230914130356.235912-1-admin@dennisbonke.com Reviewed-by: Hans de Goede Signed-off-by: Hans de Goede --- diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index d70c89d..4158442 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -4116,9 +4116,11 @@ static void hotkey_resume(void) { tpacpi_disable_brightness_delay(); + mutex_lock(&hotkey_mutex); if (hotkey_status_set(true) < 0 || hotkey_mask_set(hotkey_acpi_mask) < 0) pr_err("error while attempting to reset the event firmware interface\n"); + mutex_unlock(&hotkey_mutex); tpacpi_send_radiosw_update(); tpacpi_input_send_tabletsw();