android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: tca6416-keypad - fix interrupt enable disbalance

Browse Source 
[ Upstream commit cc141c35af873c6796e043adcb820833bd8ef8c5 ]

The driver has been switched to use IRQF_NO_AUTOEN, but in the error
unwinding and remove paths calls to enable_irq() were left in place, which
will lead to an incorrect enable counter value.

Fixes: bcd9730a04 ("Input: move to use request_irq by IRQF_NO_AUTOEN flag")
Link: https://lore.kernel.org/r/20230724053024.352054-3-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dmitry Torokhov 2023-07-23 22:30:20 -07:00 committed by Greg Kroah-Hartman
parent a7345501a3
commit e62e740009
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/input/keyboard/tca6416-keypad.c
View File

@ -292,10 +292,8 @@ static int tca6416_keypad_probe(struct i2c_client *client,
return 0; return 0;
fail2: fail2:
if (!chip->use_polling) { if (!chip->use_polling)
free_irq(client->irq, chip); free_irq(client->irq, chip);
enable_irq(client->irq);
}
fail1: fail1:
input_free_device(input); input_free_device(input);
kfree(chip); kfree(chip);
@ -306,10 +304,8 @@ static void tca6416_keypad_remove(struct i2c_client *client)
{ {
struct tca6416_keypad_chip *chip = i2c_get_clientdata(client); struct tca6416_keypad_chip *chip = i2c_get_clientdata(client);
if (!chip->use_polling) { if (!chip->use_polling)
free_irq(client->irq, chip); free_irq(client->irq, chip);
enable_irq(client->irq);
}
input_unregister_device(chip->input); input_unregister_device(chip->input);
kfree(chip); kfree(chip);