Commit 727203e6 authored Sep 19, 2023 by Danny Kaehn Committed by Greg Kroah-Hartman Nov 20, 2023

hid: cp2112: Fix duplicate workqueue initialization



[ Upstream commit e3c2d2d144c082dd71596953193adf9891491f42 ]

Previously the cp2112 driver called INIT_DELAYED_WORK within
cp2112_gpio_irq_startup, resulting in duplicate initilizations of the
workqueue on subsequent IRQ startups following an initial request. This
resulted in a warning in set_work_data in workqueue.c, as well as a rare
NULL dereference within process_one_work in workqueue.c.

Initialize the workqueue within _probe instead.

Fixes: 13de9cca ("HID: cp2112: add IRQ chip handling")
Signed-off-by: Danny Kaehn <danny.kaehn@plexus.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 48bb2931

drivers/hid/hid-cp2112.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1156,8 +1156,6 @@ static unsigned int cp2112_gpio_irq_startup(struct irq_data *d)
		struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
		struct cp2112_device *dev = gpiochip_get_data(gc);

		INIT_DELAYED_WORK(&dev->gpio_poll_worker, cp2112_gpio_poll_callback);

		if (!dev->gpio_poll) {
		dev->gpio_poll = true;
		schedule_delayed_work(&dev->gpio_poll_worker, 0);
		@@ -1353,6 +1351,8 @@ static int cp2112_probe(struct hid_device hdev, const struct hid_device_id id)
		girq->default_type = IRQ_TYPE_NONE;
		girq->handler = handle_simple_irq;

		INIT_DELAYED_WORK(&dev->gpio_poll_worker, cp2112_gpio_poll_callback);

		ret = gpiochip_add_data(&dev->gc, dev);
		if (ret < 0) {
		hid_err(hdev, "error registering gpio chip\n");