Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7154042e authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Greg Kroah-Hartman
Browse files

HID: cp2112: prevent sleeping function called from invalid context 



[ Upstream commit 2d05dba2b25ecb0f8fc3a0b4eb2232da6454a47b ]

When calling request_threaded_irq() with a CP2112, the function
cp2112_gpio_irq_startup() is called in a IRQ context.

Therefore we can not sleep, and we can not call
cp2112_gpio_direction_input() there.

Move the call to cp2112_gpio_direction_input() earlier to have a working
driver.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ab978e79

drivers/hid/hid-cp2112.c

+6 −2
Original line number Diff line number Diff line
@@ -1149,8 +1149,6 @@ static unsigned int cp2112_gpio_irq_startup(struct irq_data *d) 


	INIT_DELAYED_WORK(&dev->gpio_poll_worker, cp2112_gpio_poll_callback);



	cp2112_gpio_direction_input(gc, d->hwirq);



	if (!dev->gpio_poll) {

		dev->gpio_poll = true;

		schedule_delayed_work(&dev->gpio_poll_worker, 0);
@@ -1198,6 +1196,12 @@ static int __maybe_unused cp2112_allocate_irq(struct cp2112_device *dev, 
		return PTR_ERR(dev->desc[pin]);

	}



	ret = cp2112_gpio_direction_input(&dev->gc, pin);

	if (ret < 0) {

		dev_err(dev->gc.parent, "Failed to set GPIO to input dir\n");

		goto err_desc;

	}



	ret = gpiochip_lock_as_irq(&dev->gc, pin);

	if (ret) {

		dev_err(dev->gc.parent, "Failed to lock GPIO as interrupt\n");