diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-24 16:11:31 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-24 16:11:31 -0300 |
| commit | d35fd05efa549e444999c3cc2260906c51b0d4b9 (patch) | |
| tree | 82e35ca0ae7e40d8c783c0784563a21dd948e1a5 /linux/drivers/media/video/uvc/uvc_video.c | |
| parent | 0c962c2acd61e781501914a4b96fd47a707bccc5 (diff) | |
| parent | 73e2763100fd444d04f1cb2f7d3b039c2abab6ac (diff) | |
| download | mediapointer-dvb-s2-d35fd05efa549e444999c3cc2260906c51b0d4b9.tar.gz mediapointer-dvb-s2-d35fd05efa549e444999c3cc2260906c51b0d4b9.tar.bz2 | |
merge: http://mercurial.intuxication.org/hg/v4l-dvb-commits
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/uvc/uvc_video.c')
| -rw-r--r-- | linux/drivers/media/video/uvc/uvc_video.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/video/uvc/uvc_video.c b/linux/drivers/media/video/uvc/uvc_video.c index c833e984e..f4f4e1bb3 100644 --- a/linux/drivers/media/video/uvc/uvc_video.c +++ b/linux/drivers/media/video/uvc/uvc_video.c @@ -128,6 +128,9 @@ static int uvc_get_video_ctrl(struct uvc_video_device *video, if (data == NULL) return -ENOMEM; + if ((video->dev->quirks & UVC_QUIRK_PROBE_DEF) && query == UVC_GET_DEF) + return -EIO; + ret = __uvc_query_ctrl(video->dev, query, 0, video->streaming->intfnum, probe ? UVC_VS_PROBE_CONTROL : UVC_VS_COMMIT_CONTROL, data, size, UVC_CTRL_STREAMING_TIMEOUT); |