From: Fabio Estevam <festevam@gmail.com>
To: hverkuil-cisco@xs4all.nl
Cc: rui.silva@linaro.org, slongerbeam@gmail.com,
p.zabel@pengutronix.de, linux-media@vger.kernel.org,
sebastien.szymanski@armadeus.com, otavio@ossystems.com.br,
robh+dt@kernel.org, devicetree@vger.kernel.org,
Fabio Estevam <festevam@gmail.com>
Subject: [PATCH 7/8] media: imx7-media-csi: Check the return value from clk_prepare_enable()
Date: Sat, 4 May 2019 11:40:26 -0300 [thread overview]
Message-ID: <20190504144027.31920-7-festevam@gmail.com> (raw)
In-Reply-To: <20190504144027.31920-1-festevam@gmail.com>
clk_prepare_enable() may fail, so we should better check its return value
and propagate it in the case of error.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/staging/media/imx/imx7-media-csi.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index d1ecdcfc792e..dcc6027fe32b 100644
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -390,17 +390,23 @@ static void imx7_csi_error_recovery(struct imx7_csi *csi)
imx7_csi_hw_enable(csi);
}
-static void imx7_csi_init(struct imx7_csi *csi)
+static int imx7_csi_init(struct imx7_csi *csi)
{
+ int ret;
+
if (csi->is_init)
- return;
+ return 0;
- clk_prepare_enable(csi->mclk);
+ ret = clk_prepare_enable(csi->mclk);
+ if (ret < 0)
+ return ret;
imx7_csi_hw_reset(csi);
imx7_csi_init_interface(csi);
imx7_csi_dmareq_rff_enable(csi);
csi->is_init = true;
+
+ return 0;
}
static void imx7_csi_deinit(struct imx7_csi *csi)
@@ -513,7 +519,7 @@ static int imx7_csi_link_setup(struct media_entity *entity,
init:
if (csi->sink || csi->src_sd)
- imx7_csi_init(csi);
+ ret = imx7_csi_init(csi);
else
imx7_csi_deinit(csi);
--
2.17.1
next prev parent reply other threads:[~2019-05-04 14:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-04 14:40 [PATCH 2/8] media: imx7-media-csi: Acquire a single clock Fabio Estevam
2019-05-04 14:40 ` [PATCH 3/8] media: imx7-media-csi: Use devm_platform_ioremap_resource() Fabio Estevam
2019-05-04 14:40 ` [PATCH 4/8] media: imx7-media-csi: Propagate the correct error for platform_get_irq() Fabio Estevam
2019-05-04 14:40 ` [PATCH 5/8] media: imx7-media-csi: Propagate the correct error for devm_request_irq() Fabio Estevam
2019-05-04 14:40 ` [PATCH 6/8] media: imx7-media-csi: Remove unneeded break Fabio Estevam
2019-05-04 14:40 ` [PATCH 1/8] media: dt-bindings: imx7-csi: Document a single CSI clock Fabio Estevam
2019-05-06 21:21 ` Rui Miguel Silva
2019-05-27 20:18 ` Fabio Estevam
2019-06-13 18:07 ` Rob Herring
2019-05-04 14:40 ` Fabio Estevam [this message]
2019-05-04 14:40 ` [PATCH 8/8] media: imx7-media-csi: Change imx7_csi_enable() to void Fabio Estevam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190504144027.31920-7-festevam@gmail.com \
--to=festevam@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-media@vger.kernel.org \
--cc=otavio@ossystems.com.br \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=rui.silva@linaro.org \
--cc=sebastien.szymanski@armadeus.com \
--cc=slongerbeam@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).