evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: camera: Use mutex lock to avoid race condition"

Browse source
This commit is contained in:
Linux Build Service Account 2017-06-29 03:32:33 -07:00 • committed by Gerrit - the friendly Code Review server
commit ed7868840b
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/media/platform/msm/camera_v2/fd/msm_fd_dev.c
View file

@ -749,9 +749,13 @@ static int msm_fd_s_fmt_vid_out(struct file *file,
static int msm_fd_reqbufs(struct file *file, static int msm_fd_reqbufs(struct file *file,
void *fh, struct v4l2_requestbuffers *req) void *fh, struct v4l2_requestbuffers *req)
{ {
int ret;
struct fd_ctx *ctx = msm_fd_ctx_from_fh(fh); 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, static int msm_fd_qbuf(struct file *file, void *fh,
struct v4l2_buffer *pb) struct v4l2_buffer *pb)
{ {
int ret;
struct fd_ctx *ctx = msm_fd_ctx_from_fh(fh); 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, static int msm_fd_dqbuf(struct file *file,
void *fh, struct v4l2_buffer *pb) void *fh, struct v4l2_buffer *pb)
{ {
int ret;
struct fd_ctx *ctx = msm_fd_ctx_from_fh(fh); 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;
} }
/* /*