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

Commit 80436bac 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: Unlock rwlock before returning."

parents 0eca29e9 3ce3b95a

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

+2 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ static int msm_vb2_put_buf(struct vb2_buffer *vb, int session_id, 
			pr_err("VB buffer is INVALID vb=%pK, ses_id=%d, str_id=%d\n",

					vb, session_id, stream_id);

			spin_unlock_irqrestore(&stream->stream_lock, flags);

			read_unlock(&session->stream_rwlock);

			return -EINVAL;

		}

		msm_vb2 =
@@ -424,6 +425,7 @@ static int msm_vb2_buf_done(struct vb2_buffer *vb, int session_id, 
			pr_err("VB buffer is INVALID ses_id=%d, str_id=%d, vb=%pK\n",

				    session_id, stream_id, vb);

			spin_unlock_irqrestore(&stream->stream_lock, flags);

			read_unlock(&session->stream_rwlock);

			return -EINVAL;

		}

		msm_vb2 =