media: staging: rkisp1: params: no need to lock default config

In the function 'rkisp1_params_config_parameter' the lock
is taken while applying the default config. But the lock
only needs to protect the buffers list and the 'is_streaming'
field, so move the locking to lock only what is needed.

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 7aa76f0..f0258b4 100644 (file)
--- a/drivers/staging/media/rkisp1/rkisp1-params.c
+++ b/drivers/staging/media/rkisp1/rkisp1-params.c
@@ -1276,8 +1276,6 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
 {
        struct rkisp1_cif_isp_hst_config hst = rkisp1_hst_params_default_config;
 
-       spin_lock(&params->config_lock);
-
        rkisp1_awb_meas_config(params, &rkisp1_awb_params_default_config);
        rkisp1_awb_meas_enable(params, &rkisp1_awb_params_default_config,
                               true);
@@ -1302,6 +1300,8 @@ static void rkisp1_params_config_parameter(struct rkisp1_params *params)
        else
                rkisp1_csm_config(params, false);
 
+       spin_lock(&params->config_lock);
+
        /* apply the first buffer if there is one already */
        if (params->is_streaming)
                rkisp1_params_apply_params_cfg(params, 0);