summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabien Dessenne <fabien.dessenne@st.com>2019-05-31 05:18:15 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-09-16 08:21:43 +0200
commit573370113b24b79168289fe710c43a720676b9da (patch)
tree96524c152a34fc0ffca10c5afa81b70bb74e3d0d
parent7f8b23600779b90c6b16c2558a9d751fd9b400df (diff)
downloadlinux-stable-573370113b24b79168289fe710c43a720676b9da.tar.gz
linux-stable-573370113b24b79168289fe710c43a720676b9da.tar.bz2
linux-stable-573370113b24b79168289fe710c43a720676b9da.zip
media: stm32-dcmi: fix irq = 0 case
[ Upstream commit dbb9fcc8c2d8d4ea1104f51d4947a8a8199a2cb5 ] 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: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/media/platform/stm32/stm32-dcmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c
index d38682265892..1d9c028e52cb 100644
--- a/drivers/media/platform/stm32/stm32-dcmi.c
+++ b/drivers/media/platform/stm32/stm32-dcmi.c
@@ -1681,7 +1681,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);