summaryrefslogtreecommitdiffstats
path: root/drivers/uio
diff options
context:
space:
mode:
authorEsben Haabendal <esben@geanix.com>2020-07-01 16:56:58 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-03 10:52:02 +0200
commitbf12fdf0ab728ca8e5933aac46dd972c0dd0421e (patch)
tree5394be538f459e8a149c7b5148391188694cb6de /drivers/uio
parent324ac45f25e634eca6346953ae531e8da3e0c73d (diff)
downloadlinux-stable-bf12fdf0ab728ca8e5933aac46dd972c0dd0421e.tar.gz
linux-stable-bf12fdf0ab728ca8e5933aac46dd972c0dd0421e.tar.bz2
linux-stable-bf12fdf0ab728ca8e5933aac46dd972c0dd0421e.zip
uio_pdrv_genirq: fix use without device tree and no interrupt
While e3a3c3a20555 ("UIO: fix uio_pdrv_genirq with device tree but no interrupt") added support for using uio_pdrv_genirq for devices without interrupt for device tree platforms, the removal of uio_pdrv in 26dac3c49d56 ("uio: Remove uio_pdrv and use uio_pdrv_genirq instead") broke the support for non device tree platforms. This change fixes this, so that uio_pdrv_genirq can be used without interrupt on all platforms. This still leaves the support that uio_pdrv had for custom interrupt handler lacking, as uio_pdrv_genirq does not handle it (yet). Fixes: 26dac3c49d56 ("uio: Remove uio_pdrv and use uio_pdrv_genirq instead") Signed-off-by: Esben Haabendal <esben@geanix.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200701145659.3978-3-esben@geanix.com 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, 1 insertions, 1 deletions
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
index 1d69dd49c6d2..b60173bc93ce 100644
--- a/drivers/uio/uio_pdrv_genirq.c
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -161,7 +161,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
if (!uioinfo->irq) {
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;