Skip to content

Commit

Permalink
hid: cp2112: Fix IRQ shutdown stopping polling for all IRQs on chip
Browse files Browse the repository at this point in the history
[ Upstream commit dc3115e ]

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 <[email protected]>
Fixes: 13de9cc ("HID: cp2112: add IRQ chip handling")
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Benjamin Tissoires <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
kaehnd authored and gregkh committed Nov 20, 2023
1 parent 6ce9304 commit e284784
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/hid/hid-cp2112.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit e284784

Please sign in to comment.