Hi Dennis,
On 9/14/23 15:03, Dennis Bonke wrote:
> 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")
> Cc: stable@xxxxxxxxxxxxxxx
> Reviewed-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>
> Signed-off-by: Dennis Bonke <admin@xxxxxxxxxxxxxxx>
Thank you for your patch, I've applied this patch to my fixes
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=fixes
Note I have dropped the "Cc: stable@..." tag, because the patch this fixes
is not in the last stable release (6.5) so Cc: stable is not necessary.
I will include this patch in my next fixes pull-req to Linus
for the current kernel development cycle.
Regards,
Hans
> ---
> drivers/platform/x86/thinkpad_acpi.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> 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();
