Skip to content

Commit 81bf4a4

Browse files
Dennisbonkejwrdegoede
authored andcommitted
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: 38831ea ("platform/x86: thinkpad_acpi: use lockdep annotations") Reviewed-by: Thomas Weißschuh <[email protected]> Signed-off-by: Dennis Bonke <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Hans de Goede <[email protected]> Signed-off-by: Hans de Goede <[email protected]>
1 parent 85e654c commit 81bf4a4

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/platform/x86/thinkpad_acpi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4116,9 +4116,11 @@ static void hotkey_resume(void)
41164116
{
41174117
tpacpi_disable_brightness_delay();
41184118

4119+
mutex_lock(&hotkey_mutex);
41194120
if (hotkey_status_set(true) < 0 ||
41204121
hotkey_mask_set(hotkey_acpi_mask) < 0)
41214122
pr_err("error while attempting to reset the event firmware interface\n");
4123+
mutex_unlock(&hotkey_mutex);
41224124

41234125
tpacpi_send_radiosw_update();
41244126
tpacpi_input_send_tabletsw();

0 commit comments

Comments
 (0)