videobuf2: fix conflict during updating 4.14.113

Change-Id: Ie291279a97647b783f9e3579d4bb9fa6fc63b8fa
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index 2da70aafa3d90179fcebd0dfdeb745a87e190485..e5f4ecdb08d6feeb5816b194bf2f2c14875fd919 100644 (file)
--- 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 c20a35cdfc0608942e1faa215b56bc52e0fb3bf6..900c5f67b261e99237476f314bcace3dcf85992a 100644 (file)
--- 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)