[PATCH 5.2 065/413] media: imx7-mipi-csis: Propagate the error if clock enabling fails

[Greg Kroah-Hartman]

[ Upstream commit 2b393f91c651c16d5c09f5c7aa689e58a79df34e ]

Currently the return value from clk_bulk_prepare_enable() is checked,
but it is not propagate it in the case of failure.

Fix it and also move the error message to the caller of
mipi_csis_clk_enable().

Signed-off-by: Fabio Estevam <feste...@gmail.com>
Reviewed-by: Rui Miguel Silva <rmf...@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+sams...@kernel.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/staging/media/imx/imx7-mipi-csis.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c 
b/drivers/staging/media/imx/imx7-mipi-csis.c
index 19455f425416..7d7bdfdd852a 100644
--- a/drivers/staging/media/imx/imx7-mipi-csis.c
+++ b/drivers/staging/media/imx/imx7-mipi-csis.c
@@ -456,13 +456,9 @@ static void mipi_csis_set_params(struct csi_state *state)
                        MIPI_CSIS_CMN_CTRL_UPDATE_SHADOW_CTRL);
 }
 
-static void mipi_csis_clk_enable(struct csi_state *state)
+static int mipi_csis_clk_enable(struct csi_state *state)
 {
-       int ret;
-
-       ret = clk_bulk_prepare_enable(state->num_clks, state->clks);
-       if (ret < 0)
-               dev_err(state->dev, "failed to enable clocks\n");
+       return clk_bulk_prepare_enable(state->num_clks, state->clks);
 }
 
 static void mipi_csis_clk_disable(struct csi_state *state)
@@ -973,7 +969,11 @@ static int mipi_csis_probe(struct platform_device *pdev)
        if (ret < 0)
                return ret;
 
-       mipi_csis_clk_enable(state);
+       ret = mipi_csis_clk_enable(state);
+       if (ret < 0) {
+               dev_err(state->dev, "failed to enable clocks: %d\n", ret);
+               return ret;
+       }
 
        ret = devm_request_irq(dev, state->irq, mipi_csis_irq_handler,
                               0, dev_name(dev), state);
-- 
2.20.1