Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

platform/x86: thinkpad_acpi: Take mutex in hotkey_resume

Browse Source 
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 <linux@weissschuh.net>
Signed-off-by: Dennis Bonke <admin@dennisbonke.com>
Link: https://lore.kernel.org/r/20230914130356.235912-1-admin@dennisbonke.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Dennis Bonke 2023-09-14 15:03:56 +02:00 committed by Hans de Goede
parent 85e654c9f7
commit 81bf4a4e9c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/platform/x86/thinkpad_acpi.c
View File

@ -4116,9 +4116,11 @@ static void hotkey_resume(void)
{ {
tpacpi_disable_brightness_delay(); tpacpi_disable_brightness_delay();
mutex_lock(&hotkey_mutex);
if (hotkey_status_set(true) < 0 || if (hotkey_status_set(true) < 0 ||
hotkey_mask_set(hotkey_acpi_mask) < 0) hotkey_mask_set(hotkey_acpi_mask) < 0)
pr_err("error while attempting to reset the event firmware interface\n"); pr_err("error while attempting to reset the event firmware interface\n");
mutex_unlock(&hotkey_mutex);
tpacpi_send_radiosw_update(); tpacpi_send_radiosw_update();
tpacpi_input_send_tabletsw(); tpacpi_input_send_tabletsw();