Commit e723ebc3 authored by Michal Grzeschik's avatar Michal Grzeschik Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarMichael 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 757f5d0b

drivers/usb/gadget/function/uvc_v4l2.c

+3 −0
Original line number Diff line number Diff line
@@ -555,6 +555,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;