summaryrefslogtreecommitdiff
path: root/drivers/uio
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-10 14:42:33 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-10 14:42:33 +0300
commit2d41d2ab85d414f6ea9eac2f853b1aa31ba0820f (patch)
tree2b56ba6dc8bfa65535fc2e70ed61f40a1cbefe15 /drivers/uio
parent415abcdfd4b8326d679cd0c78bee00b5ceac9718 (diff)
parent59d1d2e8e1e7c50d2657d5e4812b53f71f507968 (diff)
downloadlinux-2d41d2ab85d414f6ea9eac2f853b1aa31ba0820f.tar.xz
Merge branch 'char-misc-linus' into 'char-misc-next'
We need the virtbox changes in here as well to build on top of. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/uio')
-rw-r--r--drivers/uio/uio_pdrv_genirq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 5f396c37a34f..63258b6accc4 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -160,9 +160,9 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
priv->pdev = pdev;
if (!uioinfo->irq) {
- ret = platform_get_irq(pdev, 0);
+ ret = platform_get_irq_optional(pdev, 0);
uioinfo->irq = ret;
- if (ret == -ENXIO && pdev->dev.of_node)
+ if (ret == -ENXIO)
uioinfo->irq = UIO_IRQ_NONE;
else if (ret == -EPROBE_DEFER)
return ret;