Merge tag 'vfio-v4.6-rc1' of git://github.com/awilliam/linux-vfio

[karo-tx-linux.git] / drivers / media / v4l2-core / videobuf-core.c

diff --git a/drivers/media/v4l2-core/videobuf-core.c b/drivers/media/v4l2-core/videobuf-core.c
index 6c02989ee33f853aa8d6d485ccde23c41646f7e9..def84753c4c32a41230237aa686a89ccd03143f7 100644 (file)
--- a/drivers/media/v4l2-core/videobuf-core.c
+++ b/drivers/media/v4l2-core/videobuf-core.c
@@ -75,7 +75,8 @@ struct videobuf_buffer *videobuf_alloc_vb(struct videobuf_queue *q)
 }
 EXPORT_SYMBOL_GPL(videobuf_alloc_vb);
 
-static int is_state_active_or_queued(struct videobuf_queue *q, struct videobuf_buffer *vb)
+static int state_neither_active_nor_queued(struct videobuf_queue *q,
+                                          struct videobuf_buffer *vb)
 {
        unsigned long flags;
        bool rc;
@@ -95,7 +96,7 @@ int videobuf_waiton(struct videobuf_queue *q, struct videobuf_buffer *vb,
        MAGIC_CHECK(vb->magic, MAGIC_BUFFER);
 
        if (non_blocking) {
-               if (is_state_active_or_queued(q, vb))
+               if (state_neither_active_nor_queued(q, vb))
                        return 0;
                return -EAGAIN;
        }
@@ -107,9 +108,10 @@ int videobuf_waiton(struct videobuf_queue *q, struct videobuf_buffer *vb,
        if (is_ext_locked)
                mutex_unlock(q->ext_lock);
        if (intr)
-               ret = wait_event_interruptible(vb->done, is_state_active_or_queued(q, vb));
+               ret = wait_event_interruptible(vb->done,
+                                       state_neither_active_nor_queued(q, vb));
        else
-               wait_event(vb->done, is_state_active_or_queued(q, vb));
+               wait_event(vb->done, state_neither_active_nor_queued(q, vb));
        /* Relock */
        if (is_ext_locked)
                mutex_lock(q->ext_lock);