Commit 1efe3c28 authored Sep 28, 2020 by Ezequiel Garcia Committed by Mauro Carvalho Chehab Oct 08, 2020

media: v4l2-mem2mem: Fix spurious v4l2_m2m_buf_done



A seemingly bad rebase introduced a spurious v4l2_m2m_buf_done,
which releases a buffer twice and therefore triggers a
noisy warning on each job:

WARNING: CPU: 0 PID: 0 at drivers/media/common/videobuf2/videobuf2-core.c:986 vb2_buffer_done+0x208/0x2a0

Fix it by removing the spurious v4l2_m2m_buf_done.

Reported-by: Adrian Ratiu <adrian.ratiu@collabora.com>
Fixes: 911ea8ec ("media: v4l2-mem2mem: add v4l2_m2m_suspend, v4l2_m2m_resume")
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Tested-by: Adrian Ratiu <adrian.ratiu@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent bf65f8aa

drivers/media/v4l2-core/v4l2-mem2mem.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -516,7 +516,6 @@ void v4l2_m2m_buf_done_and_job_finish(struct v4l2_m2m_dev *m2m_dev,

		if (WARN_ON(!src_buf \|\| !dst_buf))
		goto unlock;
		v4l2_m2m_buf_done(src_buf, state);
		dst_buf->is_held = src_buf->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
		if (!dst_buf->is_held) {
		v4l2_m2m_dst_buf_remove(m2m_ctx);

Admin message