hid: cp2112: Fix IRQ shutdown stopping polling for all IRQs on chip
authorDanny Kaehn <danny.kaehn@plexus.com>
Wed, 11 Oct 2023 18:23:17 +0000 (13:23 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:59:22 +0000 (11:59 +0100)
[ Upstream commit dc3115e6c5d9863ec1a9ff1acf004ede93c34361 ]

Previously cp2112_gpio_irq_shutdown() always cancelled the
gpio_poll_worker, even if other IRQs were still active, and did not set
the gpio_poll flag to false. This resulted in any call to _shutdown()
resulting in interrupts no longer functioning on the chip until a
_remove() occurred (a.e. the cp2112 is unplugged or system rebooted).

Only cancel polling if all IRQs are disabled/masked, and correctly set
the gpio_poll flag, allowing polling to restart when an interrupt is
next enabled.

Signed-off-by: Danny Kaehn <danny.kaehn@plexus.com>
Fixes: 13de9cca514e ("HID: cp2112: add IRQ chip handling")
Link: https://lore.kernel.org/r/20231011182317.1053344-1-danny.kaehn@plexus.com
Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/hid/hid-cp2112.c

index 36f76c6..20a0d13 100644 (file)
@@ -1166,7 +1166,11 @@ static void cp2112_gpio_irq_shutdown(struct irq_data *d)
        struct cp2112_device *dev = gpiochip_get_data(gc);
 
        cp2112_gpio_irq_mask(d);
-       cancel_delayed_work_sync(&dev->gpio_poll_worker);
+
+       if (!dev->irq_mask) {
+               dev->gpio_poll = false;
+               cancel_delayed_work_sync(&dev->gpio_poll_worker);
+       }
 }
 
 static int cp2112_gpio_irq_type(struct irq_data *d, unsigned int type)