anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: usb: gadget: uvc: only pump video data if necessary

Browse Source 
If the streaming endpoint is not enabled, the worker has nothing to do.
In the case buffers are still queued, this patch ensures that it will bail
out without handling any data.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Link: https://lore.kernel.org/r/20211017215017.18392-6-m.grzeschik@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bug: 229140375
(cherry picked from commit f9897ec0f6d34e8b2bc2f4c8ab8789351090f3d2)
Signed-off-by: Dan Vacura <w36195@motorola.com>
Change-Id: Ice201abf1f4e4f38ea2b80a990896597e365e74b
(cherry picked from commit 23cca7ad30b4896923c54645b03f49813d336640)
This commit is contained in:
Michael Grzeschik
2021-10-17 23:50:16 +02:00
committed by Matthias Männich
parent 1b5de9bdc4
commit 48ffd4d42d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/gadget/function/uvc_video.c
View File

@@ -331,12 +331,12 @@ static void uvcg_video_pump(struct work_struct *work)
{
struct uvc_video *video = container_of(work, struct uvc_video, pump);
struct uvc_video_queue *queue = &video->queue;
struct usb_request *req;
struct usb_request *req = NULL;
struct uvc_buffer *buf;
unsigned long flags;
int ret;
while (1) {
while (video->ep->enabled) {
/* Retrieve the first available USB request, protected by the
* request lock.
*/
@@ -386,6 +386,9 @@ static void uvcg_video_pump(struct work_struct *work)
video->req_int_count++;
}
if (!req)
return;
spin_lock_irqsave(&video->req_lock, flags);
list_add_tail(&req->list, &video->req_free);
spin_unlock_irqrestore(&video->req_lock, flags);