1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c
index 6ba1461d51ef..3015e6000946 100644
--- a/drivers/media/video/videobuf2-core.c
+++ b/drivers/media/video/videobuf2-core.c
@@ -492,13 +492,6 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
                 return -EINVAL;
         }
 
-        /*
-         * If the same number of buffers and memory access method is requested
-         * then return immediately.
-         */
-        if (q->memory == req->memory && req->count == q->num_buffers)
-                return 0;
-
         if (req->count == 0 || q->num_buffers != 0 || q->memory != req->memory) {
                 /*
                  * We already have buffers allocated, so first check if they
@@ -539,9 +532,9 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
         /* Finally, allocate buffers and video memory */
         ret = __vb2_queue_alloc(q, req->memory, num_buffers, num_planes,
                                 plane_sizes);
-        if (ret < 0) {
-                dprintk(1, "Memory allocation failed with error: %d\n", ret);
-                return ret;
+        if (ret == 0) {
+                dprintk(1, "Memory allocation failed\n");
+                return -ENOMEM;
         }
 
         /*
@@ -1196,6 +1189,7 @@ static void __vb2_queue_cancel(struct vb2_queue *q)
          * has not already dequeued before initiating cancel.
          */
         INIT_LIST_HEAD(&q->done_list);
+        atomic_set(&q->queued_count, 0);
         wake_up_all(&q->done_wq);
 
         /*