summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/uvc
diff options
context:
space:
mode:
authorJim Lin <jilin@nvidia.com>2017-08-08 08:56:20 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-08-20 08:08:07 -0400
commitda6df1c4dcd8e7306bb3cd34c96e19e629b798c2 (patch)
tree2cc92b2dd254fe1f627f4e504d512d03f8ced209 /drivers/media/usb/uvc
parentd8ad94ed9faf77a169bf7d2d44eaf570a63c0add (diff)
downloadlinux-da6df1c4dcd8e7306bb3cd34c96e19e629b798c2.tar.gz
linux-da6df1c4dcd8e7306bb3cd34c96e19e629b798c2.tar.bz2
linux-da6df1c4dcd8e7306bb3cd34c96e19e629b798c2.zip
media: uvcvideo: Fix incorrect timeout for Get Request
Section 9.2.6.4 of USB 2.0/3.x specification describes that "device must be able to return the first data packet to host within 500 ms of receipt of the request. For subsequent data packet, if any, the device must be able to return them within 500 ms". This is to fix incorrect timeout and change it from 300 ms to 500 ms to meet the timing specified by specification for Get Request. Signed-off-by: Jim Lin <jilin@nvidia.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/usb/uvc')
-rw-r--r--drivers/media/usb/uvc/uvcvideo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 15e415e32c7f..296b69bb3fb2 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -166,7 +166,7 @@
/* Maximum status buffer size in bytes of interrupt URB. */
#define UVC_MAX_STATUS_SIZE 16
-#define UVC_CTRL_CONTROL_TIMEOUT 300
+#define UVC_CTRL_CONTROL_TIMEOUT 500
#define UVC_CTRL_STREAMING_TIMEOUT 5000
/* Maximum allowed number of control mappings per device */