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

Commit cc118970 authored by E V Ravi's avatar E V Ravi Committed by Gerrit - the friendly Code Review server
Browse files

msm: ais: jpegdma: Added missing lock for dqbuf and streamon 



Added missing lock to avoid race conditon for dqbuf and
streamon.

Change-Id: I260dfc964066ad68552dfab0c43584708cfc8b8e
Signed-off-by: default avatarE V Ravi <evenka@codeaurora.org>
parent 0f6eb98b

drivers/media/platform/msm/ais/jpeg_dma/msm_jpeg_dma_dev.c

+10 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2019, 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
@@ -795,8 +795,12 @@ static int msm_jpegdma_dqbuf(struct file *file, 
	void *fh, struct v4l2_buffer *buf)

{

	struct jpegdma_ctx *ctx = msm_jpegdma_ctx_from_fh(fh);

	int ret;



	return v4l2_m2m_dqbuf(file, ctx->m2m_ctx, buf);

	mutex_lock(&ctx->lock);

	ret = v4l2_m2m_dqbuf(file, ctx->m2m_ctx, buf);

	mutex_unlock(&ctx->lock);

	return ret;

}



/*
@@ -811,10 +815,12 @@ static int msm_jpegdma_streamon(struct file *file, 
	struct jpegdma_ctx *ctx = msm_jpegdma_ctx_from_fh(fh);

	int ret;



	if (!msm_jpegdma_config_ok(ctx))

	mutex_lock(&ctx->lock);

	if (!msm_jpegdma_config_ok(ctx)) {

		mutex_unlock(&ctx->lock);

		return -EINVAL;

	}



	mutex_lock(&ctx->lock);



	ret = v4l2_m2m_streamon(file, ctx->m2m_ctx, buf_type);

	if (ret < 0)