diff options
| author | Laurent Pinchart <laurent.pinchart@skynet.be> | 2009-07-02 01:24:47 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@skynet.be> | 2009-07-02 01:24:47 +0200 |
| commit | c5bf599bcaa4cba04f76ae9edce2d9766a9602fd (patch) | |
| tree | 616d399f730fe3dd9b9b48fb8bbcaddd8e95cc48 /linux/drivers/media/video/uvc/uvc_video.c | |
| parent | 515fc60834c8e3e51c3fb97e362c74a3324d817e (diff) | |
| download | mediapointer-dvb-s2-c5bf599bcaa4cba04f76ae9edce2d9766a9602fd.tar.gz mediapointer-dvb-s2-c5bf599bcaa4cba04f76ae9edce2d9766a9602fd.tar.bz2 | |
uvcvideo: Multiple streaming interfaces support
From: Laurent Pinchart <laurent.pinchart@skynet.be>
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.
Priority: normal
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Diffstat (limited to 'linux/drivers/media/video/uvc/uvc_video.c')
| -rw-r--r-- | linux/drivers/media/video/uvc/uvc_video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/uvc/uvc_video.c b/linux/drivers/media/video/uvc/uvc_video.c index 38cb7a367..792a93a1c 100644 --- a/linux/drivers/media/video/uvc/uvc_video.c +++ b/linux/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, |