Merge "msm: camera: isp: Reset request queue at stop" (53d230c7) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -175,6 +175,8 @@ static void msm_isp_axi_destroy_stream(
		stream_info->bufq_handle[k] = 0;
		stream_info->vfe_mask = 0;
		stream_info->state = AVAILABLE;
		memset(&stream_info->request_queue_cmd,
		0, sizeof(stream_info->request_queue_cmd));
		}
		}

		@@ -3650,6 +3652,9 @@ static int msm_isp_request_frame(struct vfe_device *vfe_dev,
		stream_info->undelivered_request_cnt--;
		pr_err_ratelimited("%s:%d fail to cfg HAL buffer\n",
		__func__, __LINE__);
		queue_req->cmd_used = 0;
		list_del(&queue_req->list);
		stream_info->request_q_cnt--;
		return rc;
		}

		@@ -3686,6 +3691,9 @@ static int msm_isp_request_frame(struct vfe_device *vfe_dev,
		flags);
		pr_err_ratelimited("%s:%d fail to cfg HAL buffer\n",
		__func__, __LINE__);
		queue_req->cmd_used = 0;
		list_del(&queue_req->list);
		stream_info->request_q_cnt--;
		return rc;
		}
		} else {