| From 19cff01f62c72b7fc9399df29c7d040848435dcb Mon Sep 17 00:00:00 2001 |
| From: Fabien Dessenne <fabien.dessenne@st.com> |
| Date: Wed, 24 Apr 2019 09:25:44 -0400 |
| Subject: media: stm32-dcmi: return appropriate error codes during probe |
| |
| [ Upstream commit b5b5a27bee5884860798ffd0f08e611a3942064b ] |
| |
| During probe, return the provided errors value instead of -ENODEV. |
| This allows the driver to be deferred probed if needed. |
| |
| Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com> |
| Acked-by: Hugues Fruchet <hugues.fruchet@st.com> |
| 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> |
| --- |
| drivers/media/platform/stm32/stm32-dcmi.c | 14 ++++++++------ |
| 1 file changed, 8 insertions(+), 6 deletions(-) |
| |
| diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c |
| index 5fe5b38fa901d..a1f0801081ba9 100644 |
| --- a/drivers/media/platform/stm32/stm32-dcmi.c |
| +++ b/drivers/media/platform/stm32/stm32-dcmi.c |
| @@ -1645,7 +1645,7 @@ static int dcmi_probe(struct platform_device *pdev) |
| dcmi->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL); |
| if (IS_ERR(dcmi->rstc)) { |
| dev_err(&pdev->dev, "Could not get reset control\n"); |
| - return -ENODEV; |
| + return PTR_ERR(dcmi->rstc); |
| } |
| |
| /* Get bus characteristics from devicetree */ |
| @@ -1660,7 +1660,7 @@ static int dcmi_probe(struct platform_device *pdev) |
| of_node_put(np); |
| if (ret) { |
| dev_err(&pdev->dev, "Could not parse the endpoint\n"); |
| - return -ENODEV; |
| + return ret; |
| } |
| |
| if (ep.bus_type == V4L2_MBUS_CSI2_DPHY) { |
| @@ -1673,8 +1673,9 @@ static int dcmi_probe(struct platform_device *pdev) |
| |
| irq = platform_get_irq(pdev, 0); |
| if (irq <= 0) { |
| - dev_err(&pdev->dev, "Could not get irq\n"); |
| - return -ENODEV; |
| + if (irq != -EPROBE_DEFER) |
| + dev_err(&pdev->dev, "Could not get irq\n"); |
| + return irq; |
| } |
| |
| dcmi->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| @@ -1694,12 +1695,13 @@ static int dcmi_probe(struct platform_device *pdev) |
| dev_name(&pdev->dev), dcmi); |
| if (ret) { |
| dev_err(&pdev->dev, "Unable to request irq %d\n", irq); |
| - return -ENODEV; |
| + return ret; |
| } |
| |
| mclk = devm_clk_get(&pdev->dev, "mclk"); |
| if (IS_ERR(mclk)) { |
| - dev_err(&pdev->dev, "Unable to get mclk\n"); |
| + if (PTR_ERR(mclk) != -EPROBE_DEFER) |
| + dev_err(&pdev->dev, "Unable to get mclk\n"); |
| return PTR_ERR(mclk); |
| } |
| |
| -- |
| 2.20.1 |
| |