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

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

Merge "camera: Make stop_session a blocking call"

parents 3f416d7c e2271913

drivers/media/platform/msm/camera_v2/camera/camera.c

+2 −6
Original line number Diff line number Diff line
@@ -670,14 +670,11 @@ static int camera_v4l2_close(struct file *filep) 


		camera_pack_event(filep, MSM_CAMERA_SET_PARM,

			MSM_CAMERA_PRIV_DEL_STREAM, -1, &event);



		/* Donot wait, imaging server may have crashed */

		msm_post_event(&event, MSM_POST_EVT_TIMEOUT);



		camera_pack_event(filep, MSM_CAMERA_DEL_SESSION, 0, -1, &event);

		msm_post_event(&event, MSM_POST_EVT_TIMEOUT);



		/* Donot wait, imaging server may have crashed */

		msm_post_event(&event, -1);

		msm_delete_command_ack_q(pvdev->vdev->num, 0);



		/* This should take care of both normal close
@@ -688,9 +685,8 @@ static int camera_v4l2_close(struct file *filep) 
	} else {

		camera_pack_event(filep, MSM_CAMERA_SET_PARM,

			MSM_CAMERA_PRIV_DEL_STREAM, -1, &event);



		/* Donot wait, imaging server may have crashed */

		msm_post_event(&event, MSM_POST_EVT_TIMEOUT);



		msm_delete_command_ack_q(pvdev->vdev->num,

			sp->stream_id);