Merge tag 'drm-next-2020-02-07' of git://anongit.freedesktop.org/drm/drm

[linux.git] / drivers / uio / uio_pdrv_genirq.c

diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 1303b165055ba42d87d2f7f77386d7e47eb856b9..fc25ce90da3bde7aebdfded2296c317c0f59666c 100644 (file)
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -156,6 +156,8 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
                uioinfo->irq = ret;
                if (ret == -ENXIO && pdev->dev.of_node)
                        uioinfo->irq = UIO_IRQ_NONE;
+               else if (ret == -EPROBE_DEFER)
+                       return ret;
                else if (ret < 0) {
                        dev_err(&pdev->dev, "failed to get IRQ\n");
                        return ret;