diff options
| author | Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com> | 2018-05-29 16:04:47 +0200 |
|---|---|---|
| committer | Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com> | 2018-05-29 19:25:51 +0200 |
| commit | 0a3675e7fc956a99623580cfcdd6bc6ea37739d1 (patch) | |
| tree | f9df122c7d71c65bd1d866d34ee56f16bf53176f | |
| parent | 2218a1c837a42d9eee5348111b5e7df2b6a8ee4f (diff) | |
media: rockchip/isp1: skip grf writes to undefined indexes
On the RK3399, GRF_CON_ISP_DPHY_SEL=24, GRF_DSI_CSI_TESTBUS_SEL=25
are not defined. Return gracefully instead of WARN_ON.
Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
| -rw-r--r-- | drivers/media/platform/rockchip/isp1/mipi_dphy_sy.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/platform/rockchip/isp1/mipi_dphy_sy.c b/drivers/media/platform/rockchip/isp1/mipi_dphy_sy.c index 72b1876cdd03..c0541781725b 100644 --- a/drivers/media/platform/rockchip/isp1/mipi_dphy_sy.c +++ b/drivers/media/platform/rockchip/isp1/mipi_dphy_sy.c @@ -297,7 +297,11 @@ static inline void write_grf_reg(struct mipidphy_priv *priv, const struct dphy_reg *reg = &priv->grf_regs[index]; unsigned int val = HIWORD_UPDATE(value, reg->mask, reg->shift); - WARN_ON(!reg->offset); + if(!reg->offset) { + v4l2_warn(&(priv->sd), "skipping grf write to undefined index %d\n", index); + return; + } + regmap_write(priv->regmap_grf, reg->offset, val); } |