From: Helen Koike <helen.koike@collabora.com>
To: linux-media@vger.kernel.org
Cc: mchehab@kernel.org, dafna.hirschfeld@collabora.com,
linux-kernel@vger.kernel.org, tfiga@google.com,
hans.verkuil@cisco.com, kernel@collabora.com,
Helen Koike <helen.koike@collabora.com>,
Wojciech Zabolotny <wzab01@gmail.com>
Subject: [PATCH] media: staging: rkisp1: isp: check return value from phy_*
Date: Wed, 17 Jun 2020 15:22:29 -0300 [thread overview]
Message-ID: <20200617182229.164675-1-helen.koike@collabora.com> (raw)
When starting streaming, do not ignore return value from phy_set_mode(),
phy_configure() and phy_power_on().
If it fails, return error to the user.
Fixes: d65dd85281fb ("media: staging: rkisp1: add Rockchip ISP1 base driver")
Reported-by: Wojciech Zabolotny <wzab01@gmail.com>
Signed-off-by: Helen Koike <helen.koike@collabora.com>
---
drivers/staging/media/rkisp1/rkisp1-isp.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c
index dc2b59a0160a8..531047fc34a01 100644
--- a/drivers/staging/media/rkisp1/rkisp1-isp.c
+++ b/drivers/staging/media/rkisp1/rkisp1-isp.c
@@ -892,6 +892,7 @@ static int rkisp1_mipi_csi2_start(struct rkisp1_isp *isp,
union phy_configure_opts opts;
struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy;
s64 pixel_clock;
+ int ret;
if (!sensor->pixel_rate_ctrl) {
dev_warn(sensor->sd->dev, "No pixel rate control in subdev\n");
@@ -906,9 +907,24 @@ static int rkisp1_mipi_csi2_start(struct rkisp1_isp *isp,
phy_mipi_dphy_get_default_config(pixel_clock, isp->sink_fmt->bus_width,
sensor->lanes, cfg);
- phy_set_mode(sensor->dphy, PHY_MODE_MIPI_DPHY);
- phy_configure(sensor->dphy, &opts);
- phy_power_on(sensor->dphy);
+
+ ret = phy_set_mode(sensor->dphy, PHY_MODE_MIPI_DPHY);
+ if (ret) {
+ dev_err(sensor->sd->dev, "Fail setting MIPI DPHY mode\n");
+ return -EINVAL;
+ }
+
+ ret = phy_configure(sensor->dphy, &opts);
+ if (ret && ret != -EOPNOTSUPP) {
+ dev_err(sensor->sd->dev, "Fail configuring MIPI DPHY\n");
+ return -EINVAL;
+ }
+
+ ret = phy_power_on(sensor->dphy);
+ if (ret) {
+ dev_err(sensor->sd->dev, "Fail powering on MIPI DPHY\n");
+ return -EINVAL;
+ }
return 0;
}
--
2.26.0
next reply other threads:[~2020-06-17 18:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 18:22 Helen Koike [this message]
2020-06-17 21:08 ` [PATCH] media: staging: rkisp1: isp: check return value from phy_* Tomasz Figa
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=20200617182229.164675-1-helen.koike@collabora.com \
--to=helen.koike@collabora.com \
--cc=dafna.hirschfeld@collabora.com \
--cc=hans.verkuil@cisco.com \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=tfiga@google.com \
--cc=wzab01@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).