From dc5d09618c301f92f2f192ce45921b81efd300fc Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Wed, 24 Nov 2021 20:03:00 +0800 Subject: [PATCH] media: rockchip: rkcif fix some errors, these errors may cause the sub-device call to fail Signed-off-by: Zefa Chen Change-Id: I20b742c2c75324914bbb1a9405017c18900df121 --- drivers/media/platform/rockchip/cif/mipi-csi2.c | 2 ++ drivers/media/platform/rockchip/cif/subdev-itf.c | 1 + 2 files changed, 3 insertions(+) diff --git a/drivers/media/platform/rockchip/cif/mipi-csi2.c b/drivers/media/platform/rockchip/cif/mipi-csi2.c index 5fef06a397b5..aefff8de9820 100644 --- a/drivers/media/platform/rockchip/cif/mipi-csi2.c +++ b/drivers/media/platform/rockchip/cif/mipi-csi2.c @@ -390,10 +390,12 @@ static int csi2_get_selection(struct v4l2_subdev *sd, switch (sel->target) { case V4L2_SEL_TGT_CROP_BOUNDS: if (sel->which == V4L2_SUBDEV_FORMAT_ACTIVE) { + sel->pad = 0; ret = v4l2_subdev_call(sensor, pad, get_selection, cfg, sel); if (ret) { fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE; + fmt.pad = 0; ret = v4l2_subdev_call(sensor, pad, get_fmt, NULL, &fmt); if (!ret) { csi2->format_mbus = fmt.format; diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.c b/drivers/media/platform/rockchip/cif/subdev-itf.c index 7573e0d10388..6bbc670fed54 100644 --- a/drivers/media/platform/rockchip/cif/subdev-itf.c +++ b/drivers/media/platform/rockchip/cif/subdev-itf.c @@ -103,6 +103,7 @@ static int sditf_get_set_fmt(struct v4l2_subdev *sd, if (cif_dev->terminal_sensor.sd) { sditf_get_hdr_mode(priv); fmt->which = V4L2_SUBDEV_FORMAT_ACTIVE; + fmt->pad = 0; ret = v4l2_subdev_call(cif_dev->terminal_sensor.sd, pad, get_fmt, NULL, fmt); if (ret) { v4l2_err(&priv->sd,