tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: usb: gadget: uvc: dont call usb_composite_setup_continue when not streaming

Browse Source 
If the streamoff call was triggered by some previous disconnect
or userspace application shutdown the uvc_function_setup_continue
should not be called and the state should not be overwritten.

For this situation the set_alt(0) was never called and the streaming ep
has no USB_GADGET_DELAYED_STATUS pending.

Since the state then was already updated before we also omit the state
update.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Link: https://lore.kernel.org/r/20240403-uvc_request_length_by_interval-v7-9-e224bb1035f0@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Bug: 426439978
(cherry-picked from commit e723ebc3a9aa172ab8042382afcae310c953104d
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/
master)
Change-Id: Icc85fcf3ad6b9f61caa92fd5f1819f9de9a6780e
Signed-off-by: Akash M <akash.m5@samsung.com>
This commit is contained in:
Michael Grzeschik
2024-10-16 15:58:14 +02:00
committed by Treehugger Robot
parent 5da94eacba
commit 668635cd34
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/gadget/function/uvc_v4l2.c
View File

@@ -496,6 +496,9 @@ uvc_v4l2_streamoff(struct file *file, void *fh, enum v4l2_buf_type type)
if (ret < 0)
return ret;
if (uvc->state != UVC_STATE_STREAMING)
return 0;
uvc->state = UVC_STATE_CONNECTED;
uvc_function_setup_continue(uvc, 1);
return 0;