From a78dbd3f1140e65ea19b08769780c5e5100b2ea8 Mon Sep 17 00:00:00 2001 From: Youngmin Nam Date: Thu, 2 May 2019 16:43:25 +0900 Subject: [PATCH] videobuf2: fix conflict during updating 4.14.113 Change-Id: Ie291279a97647b783f9e3579d4bb9fa6fc63b8fa Signed-off-by: Youngmin Nam --- drivers/media/v4l2-core/videobuf2-core.c | 4 ---- drivers/media/v4l2-core/videobuf2-v4l2.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 2da70aafa3d9..e5f4ecdb08d6 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -917,12 +917,8 @@ static void vb2_process_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state != VB2_BUF_STATE_REQUEUEING) { /* sync buffers */ for (plane = 0; plane < vb->num_planes; ++plane) -<<<<<<< HEAD call_void_memop(vb, finish, vb->planes[plane].mem_priv, vb->planes[plane].bytesused, memflags); -======= - call_void_memop(vb, finish, vb->planes[plane].mem_priv); ->>>>>>> android-4.14-p } spin_lock_irqsave(&q->done_lock, flags); diff --git a/drivers/media/v4l2-core/videobuf2-v4l2.c b/drivers/media/v4l2-core/videobuf2-v4l2.c index c20a35cdfc06..900c5f67b261 100644 --- a/drivers/media/v4l2-core/videobuf2-v4l2.c +++ b/drivers/media/v4l2-core/videobuf2-v4l2.c @@ -146,10 +146,6 @@ static void vb2_warn_zero_bytesused(struct vb2_buffer *vb) return; check_once = true; -<<<<<<< HEAD - /* WARN_ON(1); */ -======= ->>>>>>> android-4.14-p pr_warn("use of bytesused == 0 is deprecated and will be removed in the future,\n"); if (vb->vb2_queue->allow_zero_bytesused) -- 2.20.1