]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
media: stm32-dcmi: fix irq = 0 case
authorFabien Dessenne <fabien.dessenne@st.com>
Fri, 31 May 2019 09:18:15 +0000 (05:18 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 21 Sep 2019 05:18:03 +0000 (07:18 +0200)
commit dbb9fcc8c2d8d4ea1104f51d4947a8a8199a2cb5 upstream.

Manage the irq = 0 case, where we shall return an error.

Fixes: b5b5a27bee58 ("media: stm32-dcmi: return appropriate error codes during probe")
Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com>
Reported-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/platform/stm32/stm32-dcmi.c

index b9dad0accd1ba0f742a979f6b3bc3d61989fa7f4..d855e9c09c08a600a1fbe0a0cf7cb65918e467f2 100644 (file)
@@ -1702,7 +1702,7 @@ static int dcmi_probe(struct platform_device *pdev)
        if (irq <= 0) {
                if (irq != -EPROBE_DEFER)
                        dev_err(&pdev->dev, "Could not get irq\n");
-               return irq;
+               return irq ? irq : -ENXIO;
        }
 
        dcmi->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);