diff options
Diffstat (limited to 'drivers/media/video/uvc/uvc_video.c')
-rw-r--r-- | drivers/media/video/uvc/uvc_video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c index 3369200a91d7..05139a4f14f6 100644 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/video/uvc/uvc_video.c | |||
@@ -135,7 +135,7 @@ static int uvc_get_video_ctrl(struct uvc_streaming *stream, | |||
135 | 135 | ||
136 | ret = __uvc_query_ctrl(stream->dev, query, 0, stream->intfnum, | 136 | ret = __uvc_query_ctrl(stream->dev, query, 0, stream->intfnum, |
137 | probe ? UVC_VS_PROBE_CONTROL : UVC_VS_COMMIT_CONTROL, data, | 137 | probe ? UVC_VS_PROBE_CONTROL : UVC_VS_COMMIT_CONTROL, data, |
138 | size, UVC_CTRL_STREAMING_TIMEOUT); | 138 | size, uvc_timeout_param); |
139 | 139 | ||
140 | if ((query == UVC_GET_MIN || query == UVC_GET_MAX) && ret == 2) { | 140 | if ((query == UVC_GET_MIN || query == UVC_GET_MAX) && ret == 2) { |
141 | /* Some cameras, mostly based on Bison Electronics chipsets, | 141 | /* Some cameras, mostly based on Bison Electronics chipsets, |
@@ -239,7 +239,7 @@ static int uvc_set_video_ctrl(struct uvc_streaming *stream, | |||
239 | 239 | ||
240 | ret = __uvc_query_ctrl(stream->dev, UVC_SET_CUR, 0, stream->intfnum, | 240 | ret = __uvc_query_ctrl(stream->dev, UVC_SET_CUR, 0, stream->intfnum, |
241 | probe ? UVC_VS_PROBE_CONTROL : UVC_VS_COMMIT_CONTROL, data, | 241 | probe ? UVC_VS_PROBE_CONTROL : UVC_VS_COMMIT_CONTROL, data, |
242 | size, UVC_CTRL_STREAMING_TIMEOUT); | 242 | size, uvc_timeout_param); |
243 | if (ret != size) { | 243 | if (ret != size) { |
244 | uvc_printk(KERN_ERR, "Failed to set UVC %s control : " | 244 | uvc_printk(KERN_ERR, "Failed to set UVC %s control : " |
245 | "%d (exp. %u).\n", probe ? "probe" : "commit", | 245 | "%d (exp. %u).\n", probe ? "probe" : "commit", |