The completion of the usb status phase doesn't need to be delayed
from uvc_function_set_alt to uvc_v4l2_streamon/off.
Remove USB_GADGET_DELAYED_STATUS and usb_composite_setup_delay from
these two, respectively.
Signed-off-by: Paul Elder <paul.el...@ideasonboard.com>
---
Changes in v2:
1. Remove delay usb status phase
drivers/usb/gadget/function/f_uvc.c | 3 ++-
drivers/usb/gadget/function/uvc_v4l2.c | 6 ------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/gadget/function/f_uvc.c
b/drivers/usb/gadget/function/f_uvc.c
index 9b63b28a1ee3..fa34dcbe1197 100644
--- a/drivers/usb/gadget/function/f_uvc.c
+++ b/drivers/usb/gadget/function/f_uvc.c
@@ -361,7 +361,8 @@ uvc_function_set_alt(struct usb_function *f, unsigned
interface, unsigned alt)
memset(&v4l2_event, 0, sizeof(v4l2_event));
v4l2_event.type = UVC_EVENT_STREAMON;
v4l2_event_queue(&uvc->vdev, &v4l2_event);
- return USB_GADGET_DELAYED_STATUS;
+
+ return 0;
default:
return -EINVAL;
diff --git a/drivers/usb/gadget/function/uvc_v4l2.c
b/drivers/usb/gadget/function/uvc_v4l2.c
index fdf02b6987c0..138d95b3b8d1 100644
--- a/drivers/usb/gadget/function/uvc_v4l2.c
+++ b/drivers/usb/gadget/function/uvc_v4l2.c
@@ -206,12 +206,6 @@ uvc_v4l2_streamon(struct file *file, void *fh, enum
v4l2_buf_type type)
uvc->state = UVC_STATE_STREAMING;
- /*
- * Complete the alternate setting selection setup phase now that
- * userspace is ready to provide video frames.
- */
- uvc_function_setup_continue(uvc);
-
return 0;
}
--
2.17.0
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
