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

Commit eb8518b6 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: Identify invalid buf done's on vb2 buffer"

parents 0a9223b6 4fd1a431

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

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int msm_vb2_put_buf(struct vb2_buffer *vb, int session_id, 
			if (vb2_buf == vb)

				break;

		}

		if (vb2_buf != vb) {

		if (WARN_ON(vb2_buf != vb)) {

			pr_err("VB buffer is INVALID vb=%p, ses_id=%d, str_id=%d\n",

					vb, session_id, stream_id);

			spin_unlock_irqrestore(&stream->stream_lock, flags);
@@ -287,7 +287,7 @@ static int msm_vb2_buf_done(struct vb2_buffer *vb, int session_id, 
			if (vb2_buf == vb)

				break;

		}

		if (vb2_buf != vb) {

		if (WARN_ON(vb2_buf != vb)) {

			pr_err("VB buffer is INVALID ses_id=%d, str_id=%d, vb=%p\n",

				    session_id, stream_id, vb);

			spin_unlock_irqrestore(&stream->stream_lock, flags);