usb: gadget: uvc: remove pause flag use

The pause flag doesn't appear to serve a purpose as it is possible for
the pump worker thread to not be running when new buffers are queued.
Before the following change was introduced: "7b8e69da657b usb: gadget:
uvc_video: add worker to handle the frame pumping", the pause flag
status was discarded and never returned. This masked a current issues of
the userspace receiving non-zero values (considered unsuccessful) and
prevents trace_v4l2_qbuf() from being called.

Signed-off-by: Dan Vacura <w36195@motorola.com>
Link: https://lore.kernel.org/r/20220413192402.26063-1-w36195@motorola.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/gadget/function/uvc_queue.c b/drivers/usb/gadget/function/uvc_queue.c
index d852ac9e47e72c65218bc7649c237a592578cee4..8fd2f4a3dc4c3324f17499f3275dddb275a9c4c1 100644 (file)
--- a/drivers/usb/gadget/function/uvc_queue.c
+++ b/drivers/usb/gadget/function/uvc_queue.c
@@ -185,18 +185,7 @@ int uvcg_query_buffer(struct uvc_video_queue *queue, struct v4l2_buffer *buf)
 
 int uvcg_queue_buffer(struct uvc_video_queue *queue, struct v4l2_buffer *buf)
 {
-       unsigned long flags;
-       int ret;
-
-       ret = vb2_qbuf(&queue->queue, NULL, buf);
-       if (ret < 0)
-               return ret;
-
-       spin_lock_irqsave(&queue->irqlock, flags);
-       ret = (queue->flags & UVC_QUEUE_PAUSED) != 0;
-       queue->flags &= ~UVC_QUEUE_PAUSED;
-       spin_unlock_irqrestore(&queue->irqlock, flags);
-       return ret;
+       return vb2_qbuf(&queue->queue, NULL, buf);
 }
 
 /*
@@ -362,8 +351,6 @@ struct uvc_buffer *uvcg_queue_head(struct uvc_video_queue *queue)
        if (!list_empty(&queue->irqqueue))
                buf = list_first_entry(&queue->irqqueue, struct uvc_buffer,
                                       queue);
-       else
-               queue->flags |= UVC_QUEUE_PAUSED;
 
        return buf;
 }

diff --git a/drivers/usb/gadget/function/uvc_queue.h b/drivers/usb/gadget/function/uvc_queue.h
index 05360a0767f61f8f4e20010e4a70a8a5cee7928b..42aaf8b227ddf8a21f3987ab18189fdd970e7538 100644 (file)
--- a/drivers/usb/gadget/function/uvc_queue.h
+++ b/drivers/usb/gadget/function/uvc_queue.h
@@ -43,7 +43,6 @@ struct uvc_buffer {
 
 #define UVC_QUEUE_DISCONNECTED         (1 << 0)
 #define UVC_QUEUE_DROP_INCOMPLETE      (1 << 1)
-#define UVC_QUEUE_PAUSED               (1 << 2)
 
 struct uvc_video_queue {
        struct vb2_queue queue;