diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2010-01-19 06:59:21 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:11:04 -0500 |
| commit | 56d15cd313d0d0d7a16c1a2e2cc519f18ab4725a (patch) | |
| tree | a46b6bda01077b3f7ca03196fb1c226978f18a6d /drivers/media/video/uvc/uvcvideo.h | |
| parent | e070bf9ef85e293d9dc586fbfabc008795564c0e (diff) | |
V4L/DVB: uvcvideo: Increase the streaming control timeout to 5 seconds
This fixes timeout issues with some Logitech webcams. The timeout value
seems to match the one used in the Logitech Windows driver, so no
further increase should be necessary.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc/uvcvideo.h')
| -rw-r--r-- | drivers/media/video/uvc/uvcvideo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h index 6aa9b2c2b68..d0d3e25e1c0 100644 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/video/uvc/uvcvideo.h | |||
| @@ -152,7 +152,7 @@ struct uvc_xu_control { | |||
| 152 | #define UVC_MAX_STATUS_SIZE 16 | 152 | #define UVC_MAX_STATUS_SIZE 16 |
| 153 | 153 | ||
| 154 | #define UVC_CTRL_CONTROL_TIMEOUT 300 | 154 | #define UVC_CTRL_CONTROL_TIMEOUT 300 |
| 155 | #define UVC_CTRL_STREAMING_TIMEOUT 3000 | 155 | #define UVC_CTRL_STREAMING_TIMEOUT 5000 |
| 156 | 156 | ||
| 157 | /* Devices quirks */ | 157 | /* Devices quirks */ |
| 158 | #define UVC_QUIRK_STATUS_INTERVAL 0x00000001 | 158 | #define UVC_QUIRK_STATUS_INTERVAL 0x00000001 |