diff options
| author | Laurent Pinchart <laurent.pinchart@skynet.be> | 2009-07-01 20:24:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-12 12:18:33 -0300 |
| commit | 8e113595edf0741b45ba10ba88cb5d077787c155 (patch) | |
| tree | 3b2d7b940445989586ad198d2c5c974432d97618 /drivers/media/video/uvc/uvc_video.c | |
| parent | 35f02a681b72ece756cf005e17f305a72329c140 (diff) | |
| download | op-kernel-dev-8e113595edf0741b45ba10ba88cb5d077787c155.zip op-kernel-dev-8e113595edf0741b45ba10ba88cb5d077787c155.tar.gz | |
V4L/DVB (12379): uvcvideo: Multiple streaming interfaces support
Restructure the UVC descriptors parsing code to handle multiple streaming
interfaces. The driver now creates a uvc_video_chain instance for each chain
detected in the UVC control interface descriptors, and tries to register one
video device per streaming endpoint.
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc/uvc_video.c')
| -rw-r--r-- | drivers/media/video/uvc/uvc_video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c index acbd73a..5b757f3 100644 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/video/uvc/uvc_video.c @@ -128,7 +128,7 @@ static int uvc_get_video_ctrl(struct uvc_streaming *stream, if (data == NULL) return -ENOMEM; - if ((video->dev->quirks & UVC_QUIRK_PROBE_DEF) && query == UVC_GET_DEF) + if ((stream->dev->quirks & UVC_QUIRK_PROBE_DEF) && query == UVC_GET_DEF) return -EIO; ret = __uvc_query_ctrl(stream->dev, query, 0, stream->intfnum, |
