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

Commit 73135edf 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: isp: fix overflow during stop axi stream" into msm-3.18

parents bfb07a5c eeb4d2a8

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

+3 −1
Original line number Diff line number Diff line
@@ -1246,7 +1246,9 @@ void msm_isp_axi_stream_update(struct vfe_device *vfe_dev, 
		else if (axi_data->stream_info[i].state == START_PENDING ||

			axi_data->stream_info[i].state == STOP_PENDING) {

			msm_isp_axi_stream_enable_cfg(

				vfe_dev, &axi_data->stream_info[i], 1);

				vfe_dev, &axi_data->stream_info[i],

				axi_data->stream_info[i].state ==

				START_PENDING ? 1 : 0);

			axi_data->stream_info[i].state =

				axi_data->stream_info[i].state ==

				START_PENDING ? STARTING : STOPPING;