diff options
| author | Dennis Bonke <admin@dennisbonke.com> | 2023-09-14 16:03:56 +0300 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2023-09-18 16:16:19 +0300 |
| commit | 81bf4a4e9cb754e957ab614cde6a3b16244d670b (patch) | |
| tree | 52c6bfbbfed825a149d275771c8ea76d44319332 /drivers/platform | |
| parent | 85e654c9f722853a595fa941dca60c157b707b86 (diff) | |
| download | linux-81bf4a4e9cb754e957ab614cde6a3b16244d670b.tar.xz | |
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 <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>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index d70c89d32534..41584427dc32 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(); |