From 1136fd6608df267742304772b355ceeee55ca182 Mon Sep 17 00:00:00 2001 From: Shunhua Lan Date: Mon, 24 Mar 2025 19:00:38 +0800 Subject: [PATCH] media: i2c: rk628: fix g_volatile_ctrl return value g_volatile_ctrl should return 0 if no error Signed-off-by: Shunhua Lan Change-Id: I8f9d338a0a0421ba65940a0275d1f4378bc31504 --- drivers/media/i2c/rk628/rk628_csi_v4l2.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/rk628/rk628_csi_v4l2.c b/drivers/media/i2c/rk628/rk628_csi_v4l2.c index 540e054547b6..552c90f94543 100644 --- a/drivers/media/i2c/rk628/rk628_csi_v4l2.c +++ b/drivers/media/i2c/rk628/rk628_csi_v4l2.c @@ -3031,17 +3031,16 @@ static const struct v4l2_subdev_ops rk628_csi_ops = { static int rk628_csi_get_custom_ctrl(struct v4l2_ctrl *ctrl) { - int ret = -EINVAL; + int ret = 0; struct rk628_csi *csi = container_of(ctrl->handler, struct rk628_csi, hdl); struct v4l2_subdev *sd = &csi->sd; if (ctrl->id == RK_V4L2_CID_AUDIO_SAMPLING_RATE) { - ret = get_audio_sampling_rate(sd); - *ctrl->p_new.p_s32 = ret; + *ctrl->p_new.p_s32 = get_audio_sampling_rate(sd); } else if (ctrl->id == RK_V4L2_CID_AUDIO_PRESENT) { - ret = tx_5v_power_present(sd) ? rk628_hdmirx_audio_present(csi->audio_info) : 0; - *ctrl->p_new.p_s32 = ret; + *ctrl->p_new.p_s32 = tx_5v_power_present(sd) ? + rk628_hdmirx_audio_present(csi->audio_info) : 0; } else { ret = -EINVAL; }