aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/uio
diff options
context:
space:
mode:
authorOscar Ravadilla <oscar.ravadilla@alliedtelesis.co.nz>2020-01-08 13:16:48 +1300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-14 15:27:51 +0100
commit34bc4f468a9fab1e8c85f05117a0d46adec2c200 (patch)
tree1c9a691b0c68cffb95b80e96ef87d1de929f438c /drivers/uio
parentuio: fix a sleep-in-atomic-context bug in uio_dmem_genirq_irqcontrol() (diff)
downloadlinux-dev-34bc4f468a9fab1e8c85f05117a0d46adec2c200.tar.xz
linux-dev-34bc4f468a9fab1e8c85f05117a0d46adec2c200.zip
uio: uio_pdrv_genirq: Do not log an error when deferring probe routine.
When deferring the probe routine just return without displaying an error. Signed-off-by: Oscar Ravadilla <oscar.ravadilla@alliedtelesis.co.nz> Link: https://lore.kernel.org/r/20200108001648.2949-1-oscar.ravadilla@alliedtelesis.co.nz Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/uio')
-rw-r--r--drivers/uio/uio_pdrv_genirq.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 1303b165055b..fc25ce90da3b 100644
--- 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;