Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39f37029 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Fix ISP output buffer handling"

parents 601fbce8 d5748bca

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

+3 −2
Original line number Diff line number Diff line
@@ -830,7 +830,6 @@ static void msm_isp_get_done_buf(struct vfe_device *vfe_dev, 
		stream_info->request_frm_num--;



	*done_buf = stream_info->buf[pingpong_bit];

	stream_info->buf[pingpong_bit] = NULL;

}



static int msm_isp_cfg_ping_pong_address(struct vfe_device *vfe_dev,
@@ -842,8 +841,10 @@ static int msm_isp_cfg_ping_pong_address(struct vfe_device *vfe_dev, 
	uint32_t bufq_handle = 0;

	uint32_t stream_idx = HANDLE_TO_IDX(stream_info->stream_handle);



	if (stream_info->controllable_output && !stream_info->request_frm_num)

	if (stream_info->controllable_output && !stream_info->request_frm_num) {

		stream_info->buf[pingpong_bit] = NULL;

		return 0;

	}



	bufq_handle = stream_info->bufq_handle;