From: Dafna Hirschfeld Date: Tue, 22 Sep 2020 11:33:53 +0000 (+0200) Subject: media: staging: rkisp1: params: use the new effect value in cproc config X-Git-Tag: v5.10-rc1~175^2~96 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd5257ebf91875676283628c56b394486ca4e1af;p=thirdparty%2Fkernel%2Flinux.git media: staging: rkisp1: params: use the new effect value in cproc config The cproc (color processing) configuration needs to know if an image effect is configured. The code uses the image effect in 'cur_params' which is the first params buffer queued in the stream. This is the wrong place to read the value. The value should be taken from the current params buffer. Signed-off-by: Dafna Hirschfeld Acked-by: Helen Koike Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/staging/media/rkisp1/rkisp1-params.c index 8bd7cc622e4f9..ab2deb57b1eb4 100644 --- a/drivers/staging/media/rkisp1/rkisp1-params.c +++ b/drivers/staging/media/rkisp1/rkisp1-params.c @@ -552,7 +552,7 @@ static void rkisp1_cproc_config(struct rkisp1_params *params, const struct rkisp1_cif_isp_cproc_config *arg) { struct rkisp1_cif_isp_isp_other_cfg *cur_other_cfg = - ¶ms->cur_params.others; + container_of(arg, struct rkisp1_cif_isp_isp_other_cfg, cproc_config); struct rkisp1_cif_isp_ie_config *cur_ie_config = &cur_other_cfg->ie_config; u32 effect = cur_ie_config->effect;