diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-23 09:44:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-23 09:44:29 -0800 |
| commit | 3bf6f013980a9cf255c52135b74339a8fc332dfc (patch) | |
| tree | 4b33957bcce051164512a8066e43c81cdd57630b /drivers/gpio/gpio-virtio.c | |
| parent | 0d81b5faa234e92a56df1bc8ef3dacb7d5203efd (diff) | |
| parent | 3e4d9a485029aa9e172dab5420abe775fd86f8e8 (diff) | |
Merge tag 'gpio-fixes-for-v5.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fixes from Bartosz Golaszewski:
- fix interrupts when replugging the device in gpio-dln2
- remove the arbitrary timeout on virtio requests from gpio-virtio
* tag 'gpio-fixes-for-v5.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
gpio: virtio: remove timeout
gpio: dln2: Fix interrupts when replugging the device
Diffstat (limited to 'drivers/gpio/gpio-virtio.c')
| -rw-r--r-- | drivers/gpio/gpio-virtio.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-virtio.c b/drivers/gpio/gpio-virtio.c index 84f96b78f32a..9f4941bc5760 100644 --- a/drivers/gpio/gpio-virtio.c +++ b/drivers/gpio/gpio-virtio.c @@ -100,11 +100,7 @@ static int _virtio_gpio_req(struct virtio_gpio *vgpio, u16 type, u16 gpio, virtqueue_kick(vgpio->request_vq); mutex_unlock(&vgpio->lock); - if (!wait_for_completion_timeout(&line->completion, HZ)) { - dev_err(dev, "GPIO operation timed out\n"); - ret = -ETIMEDOUT; - goto out; - } + wait_for_completion(&line->completion); if (unlikely(res->status != VIRTIO_GPIO_STATUS_OK)) { dev_err(dev, "GPIO request failed: %d\n", gpio); |