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

Commit 12f97e10 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: Use mutex lock to avoid race condition"

parents 2aca3e3a 0cd53d07

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

+17 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -747,9 +747,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;

}



/*
@@ -761,9 +765,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;



}



/*
@@ -775,9 +784,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;

}



/*