Merge tag 'v5.16-rc2' into devel
Linux 5.16-rc2 is needed because nonurgent fixes headed for next are strongly textually dependent on a fix that was applied for rc2. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
@@ -523,6 +523,7 @@ config GPIO_REG
|
||||
config GPIO_ROCKCHIP
|
||||
tristate "Rockchip GPIO support"
|
||||
depends on ARCH_ROCKCHIP || COMPILE_TEST
|
||||
select GENERIC_IRQ_CHIP
|
||||
select GPIOLIB_IRQCHIP
|
||||
default ARCH_ROCKCHIP
|
||||
help
|
||||
|
||||
@@ -434,7 +434,7 @@ static void virtio_gpio_event_vq(struct virtqueue *vq)
|
||||
ret = generic_handle_domain_irq(vgpio->gc.irq.domain, gpio);
|
||||
if (ret)
|
||||
dev_err(dev, "failed to handle interrupt: %d\n", ret);
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
static void virtio_gpio_request_vq(struct virtqueue *vq)
|
||||
|
||||
Reference in New Issue
Block a user