Merge "msm: ais: jpegdma: Fix for ASAN issues in jpegdma module" (10ff8f3a) · Commits · e / devices / android_kernel_xiaomi_markw

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

+8 −5

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2018, 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
		@@ -754,9 +754,12 @@ static int msm_jpegdma_s_fmt_vid_out(struct file *file,
		static int msm_jpegdma_reqbufs(struct file *file,
		void fh, struct v4l2_requestbuffers req)
		{
		int ret = 0;
		struct jpegdma_ctx *ctx = msm_jpegdma_ctx_from_fh(fh);

		return v4l2_m2m_reqbufs(file, ctx->m2m_ctx, req);
		mutex_lock(&ctx->lock);
		ret = v4l2_m2m_reqbufs(file, ctx->m2m_ctx, req);
		mutex_unlock(&ctx->lock);
		return ret;
		}

		/*
		@@ -833,11 +836,11 @@ static int msm_jpegdma_streamoff(struct file *file,
		{
		struct jpegdma_ctx *ctx = msm_jpegdma_ctx_from_fh(fh);
		int ret;

		mutex_lock(&ctx->lock);
		ret = v4l2_m2m_streamoff(file, ctx->m2m_ctx, buf_type);
		if (ret < 0)
		dev_err(ctx->jdma_device->dev, "Stream off fails\n");

		mutex_unlock(&ctx->lock);
		return ret;
		}