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 <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/rkisp1/rkisp1-params.c b/drivers/staging/media/rkisp1/rkisp1-params.c
index 8bd7cc622e4f9d3570735dbdfcee143163b837ab..ab2deb57b1eb4bf1db2b816f7b4ab4ef33d22f77 100644 (file)
--- 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 =
-                                               &params->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;