OSDN Git Service

media: staging: rkisp1 stats: set a measure flag with '|=' instead of '='
authorDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Sat, 9 May 2020 15:29:03 +0000 (17:29 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 23 Jun 2020 11:14:49 +0000 (13:14 +0200)
The flag RKISP1_CIF_ISP_STAT_AFM_FIN that indicates a type of
statistics is mistakenly set with '=' instead of '|='
this might set off previous flags.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/staging/media/rkisp1/rkisp1-stats.c

index 6dfcbdc..8351bda 100644 (file)
@@ -253,7 +253,7 @@ static void rkisp1_stats_get_afc_meas(struct rkisp1_stats *stats,
        struct rkisp1_device *rkisp1 = stats->rkisp1;
        struct rkisp1_cif_isp_af_stat *af;
 
-       pbuf->meas_type = RKISP1_CIF_ISP_STAT_AFM_FIN;
+       pbuf->meas_type |= RKISP1_CIF_ISP_STAT_AFM_FIN;
 
        af = &pbuf->params.af;
        af->window[0].sum = rkisp1_read(rkisp1, RKISP1_CIF_ISP_AFM_SUM_A);