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 <[email protected]>
Signed-off-by: Helen Koike <[email protected]>

---

 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

Reply via email to