commit f5feb668151375a9cb1bf53481ddd70edd6491e7
author Linux Build Service Account <lnxbuild@localhost> Thu Oct 11 15:56:15 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Oct 11 15:56:14 2018 -0700
tree d7cd54648257c7538c013ecb60ef684e07f960ee
parent c2fcb49b56f84f73156eb481f20ab949a2fc5aad
parent 7b4a7789ac483c2af74ba1f40c2e3c8e36c4d549

Merge "msm: camera: isp: modify buffer state process for apq8009"

drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c

diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c b/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
index 6196a8c..7a0a069 100644
--- a/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
+++ b/drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c
@@ -676,6 +676,10 @@
 		rc = 0;
 		break;
 	case MSM_ISP_BUFFER_STATE_QUEUED:
+		if (IS_ENABLED(CONFIG_MSM_ISP_V1)) {
+			rc = 0;
+			break;
+		}
 	case MSM_ISP_BUFFER_STATE_DIVERTED:
 	default:
 		WARN(1, "%s: bufq 0x%x, buf idx 0x%x, incorrect state = %d",