summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrikanth Uyyala <suyyala@codeaurora.org>2018-05-04 14:23:10 +0530
committerSrikanth Uyyala <suyyala@codeaurora.org>2018-07-20 11:58:56 +0530
commit3a3c7c7bb198c87204bbcd272c46c594bbc030f9 (patch)
tree01004b385a406e4d0791252a35aaffbdf53ed7c7
parent093e11e9d29912ceadbde6e82202256ed2cd9bcc (diff)
msm: camera: Dont call recovery for inactive streams
During Stream-off is in progress and all active streams are zero and that instant if we cause pingpong mismatch, recovery is not expected. Change-Id: Ibdaeb4308f33772fcd330712b0a866aedb7a9486 Signed-off-by: Srikanth Uyyala <suyyala@codeaurora.org>
-rw-r--r--drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c4
1 files changed, 4 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 925a89601636..07defdd76922 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
@@ -1699,6 +1699,10 @@ void msm_isp_halt_send_error(struct vfe_device *vfe_dev, uint32_t event)
/* Recovery is already in Progress */
return;
+ /* if there are no active streams - do not start recovery */
+ if (!vfe_dev->axi_data.num_active_stream)
+ return;
+
if (event == ISP_EVENT_PING_PONG_MISMATCH &&
vfe_dev->axi_data.recovery_count < MAX_RECOVERY_THRESHOLD) {
pr_err("%s: ping pong mismatch on vfe%d recovery count %d\n",