summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-10-16 02:48:26 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-10-16 02:48:26 -0700
commit5eef2bb525e761da28a5201ff04e1c152e2c4ebb (patch)
tree604ad471ff39fa2792e02edb9bf6275a4b4d8527
parent9f5569b5177dcbf68fd387627ae4ff4dc76af030 (diff)
parent2914629839b9abe1ce78470cdeba616791f5c4f1 (diff)
Merge "msm: camera: isp: Reset frameskip range during streamoff"
-rw-r--r--drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
index 66c5ce11ea3d..5bcb3034b82a 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
@@ -2916,6 +2916,8 @@ static void __msm_isp_stop_axi_streams(struct vfe_device *vfe_dev,
* those state transitions instead of directly forcing stream to
* be INACTIVE
*/
+ memset(&stream_info->sw_skip, 0,
+ sizeof(struct msm_isp_sw_framskip));
intf = SRC_TO_INTF(stream_info->stream_src);
if (stream_info->lpm_mode == 0 &&
stream_info->state != PAUSED) {