summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDafna Hirschfeld <dafna.hirschfeld@collabora.com>2020-05-09 17:29:03 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-06-23 13:14:49 +0200
commit445093ff76a0b01628637b5890ac332507d8a197 (patch)
treeb2e4384fe7f47f74f2de08824b09cd1aca8caf41 /drivers
parentmedia: v4l: xilinx: Add Xilinx MIPI CSI-2 Rx Subsystem driver (diff)
downloadlinux-445093ff76a0b01628637b5890ac332507d8a197.tar.xz
linux-445093ff76a0b01628637b5890ac332507d8a197.zip
media: staging: rkisp1 stats: set a measure flag with '|=' instead of '='
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/media/rkisp1/rkisp1-stats.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/rkisp1/rkisp1-stats.c b/drivers/staging/media/rkisp1/rkisp1-stats.c
index 6dfcbdc3deb8..8351bda0be03 100644
--- a/drivers/staging/media/rkisp1/rkisp1-stats.c
+++ b/drivers/staging/media/rkisp1/rkisp1-stats.c
@@ -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);