Input: tca6416-keypad - fix interrupt enable disbalance

[ 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: bcd9730a04a1 ("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>

diff --git a/drivers/input/keyboard/tca6416-keypad.c b/drivers/input/keyboard/tca6416-keypad.c
index b48adec8fe2e7ccb6a930c405f79670342478416..9c1489c0dae13abf3226ad6979a589d4533d5cc1 100644 (file)
--- a/drivers/input/keyboard/tca6416-keypad.c
+++ b/drivers/input/keyboard/tca6416-keypad.c
@@ -292,10 +292,8 @@ static int tca6416_keypad_probe(struct i2c_client *client,
        return 0;
 
 fail2:
-       if (!chip->use_polling) {
+       if (!chip->use_polling)
                free_irq(client->irq, chip);
-               enable_irq(client->irq);
-       }
 fail1:
        input_free_device(input);
        kfree(chip);
@@ -306,10 +304,8 @@ static void tca6416_keypad_remove(struct i2c_client *client)
 {
        struct tca6416_keypad_chip *chip = i2c_get_clientdata(client);
 
-       if (!chip->use_polling) {
+       if (!chip->use_polling)
                free_irq(client->irq, chip);
-               enable_irq(client->irq);
-       }
 
        input_unregister_device(chip->input);
        kfree(chip);