| Message ID | 20190531174506.13251-1-festevam@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] media: imx7-mipi-csis: Propagate the error if clock enabling fails | expand |
Oi Fabio, On Fri 31 May 2019 at 18:45, Fabio Estevam wrote: > 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 <festevam@gmail.com> Thanks for the 3 patches. for all of them: Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com> --- Cheers, Rui > --- > 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 042837b8ea28..1b538ae77364 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) > @@ -989,7 +985,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);
diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c index 042837b8ea28..1b538ae77364 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) @@ -989,7 +985,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);
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 <festevam@gmail.com> --- drivers/staging/media/imx/imx7-mipi-csis.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)