Merge "msm: camera: Use mutex lock to avoid race condition" (ed786884) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/platform/msm/camera_v2/fd/msm_fd_dev.c

+16 −3

Original line number	Diff line number	Diff line
		@@ -749,9 +749,13 @@ static int msm_fd_s_fmt_vid_out(struct file *file,
		static int msm_fd_reqbufs(struct file *file,
		void fh, struct v4l2_requestbuffers req)
		{
		int ret;
		struct fd_ctx *ctx = msm_fd_ctx_from_fh(fh);

		return vb2_reqbufs(&ctx->vb2_q, req);
		mutex_lock(&ctx->fd_device->recovery_lock);
		ret = vb2_reqbufs(&ctx->vb2_q, req);
		mutex_unlock(&ctx->fd_device->recovery_lock);
		return ret;
		}

		/*
		@@ -763,9 +767,14 @@ static int msm_fd_reqbufs(struct file *file,
		static int msm_fd_qbuf(struct file file, void fh,
		struct v4l2_buffer *pb)
		{
		int ret;
		struct fd_ctx *ctx = msm_fd_ctx_from_fh(fh);

		return vb2_qbuf(&ctx->vb2_q, pb);
		mutex_lock(&ctx->fd_device->recovery_lock);
		ret = vb2_qbuf(&ctx->vb2_q, pb);
		mutex_unlock(&ctx->fd_device->recovery_lock);
		return ret;

		}

		/*
		@@ -777,9 +786,13 @@ static int msm_fd_qbuf(struct file file, void fh,
		static int msm_fd_dqbuf(struct file *file,
		void fh, struct v4l2_buffer pb)
		{
		int ret;
		struct fd_ctx *ctx = msm_fd_ctx_from_fh(fh);

		return vb2_dqbuf(&ctx->vb2_q, pb, file->f_flags & O_NONBLOCK);
		mutex_lock(&ctx->fd_device->recovery_lock);
		ret = vb2_dqbuf(&ctx->vb2_q, pb, file->f_flags & O_NONBLOCK);
		mutex_unlock(&ctx->fd_device->recovery_lock);
		return ret;
		}

		/*