Commit be30e350 authored by Dan Vacura's avatar Dan Vacura Committed by Greg Kroah-Hartman
Browse files

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: "43cd0023 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: default avatarDan Vacura <w36195@motorola.com>
Link: https://lore.kernel.org/r/20220413192402.26063-1-w36195@motorola.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 324e4f85

drivers/usb/gadget/function/uvc_queue.c

+1 −14
Original line number Diff line number Diff line
@@ -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;

}

drivers/usb/gadget/function/uvc_queue.h

+0 −1
Original line number Diff line number Diff line
@@ -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;