diff options
| author | Danny Kaehn <danny.kaehn@plexus.com> | 2023-10-11 20:23:17 +0200 |
|---|---|---|
| committer | Benjamin Tissoires <bentiss@kernel.org> | 2023-10-25 15:19:40 +0200 |
| commit | dc3115e6c5d9863ec1a9ff1acf004ede93c34361 (patch) | |
| tree | 8eb26556ad2ef1047aa9a75f778261c7c3d8fa60 /drivers/hid | |
| parent | hid: cp2112: Fix duplicate workqueue initialization (diff) | |
| download | linux-dc3115e6c5d9863ec1a9ff1acf004ede93c34361.tar.xz linux-dc3115e6c5d9863ec1a9ff1acf004ede93c34361.zip | |
hid: cp2112: Fix IRQ shutdown stopping polling for all IRQs on chip
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>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-cp2112.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 36f76c6dfa20..20a0d1315d90 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c @@ -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) |