diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-05 12:52:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-05 12:52:42 -0300 |
| commit | 94d71b8a17f2bce10c41c2b8c859d9fe8630735c (patch) | |
| tree | e9cdda08d32abcdb1400354cc918d4485c9ed405 /linux/drivers/media/video/uvc/uvc_isight.c | |
| parent | 0205500e6618084b21d9c12d4e4494e026d4239c (diff) | |
| parent | 88c2688c2603bd65581bef5c0512264b56429cf9 (diff) | |
| download | mediapointer-dvb-s2-94d71b8a17f2bce10c41c2b8c859d9fe8630735c.tar.gz mediapointer-dvb-s2-94d71b8a17f2bce10c41c2b8c859d9fe8630735c.tar.bz2 | |
merge: http://linuxtv.org/hg/~jfrancois/v4l-dvb
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_isight.c')
| -rw-r--r-- | linux/drivers/media/video/uvc/uvc_isight.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/uvc/uvc_isight.c b/linux/drivers/media/video/uvc/uvc_isight.c index 436f46268..a9285b570 100644 --- a/linux/drivers/media/video/uvc/uvc_isight.c +++ b/linux/drivers/media/video/uvc/uvc_isight.c @@ -99,7 +99,7 @@ static int isight_decode(struct uvc_video_queue *queue, struct uvc_buffer *buf, return 0; } -void uvc_video_decode_isight(struct urb *urb, struct uvc_video_device *video, +void uvc_video_decode_isight(struct urb *urb, struct uvc_streaming *stream, struct uvc_buffer *buf) { int ret, i; @@ -120,7 +120,7 @@ void uvc_video_decode_isight(struct urb *urb, struct uvc_video_device *video, * processes the data of the first payload of the new frame. */ do { - ret = isight_decode(&video->queue, buf, + ret = isight_decode(&stream->queue, buf, urb->transfer_buffer + urb->iso_frame_desc[i].offset, urb->iso_frame_desc[i].actual_length); @@ -130,7 +130,8 @@ void uvc_video_decode_isight(struct urb *urb, struct uvc_video_device *video, if (buf->state == UVC_BUF_STATE_DONE || buf->state == UVC_BUF_STATE_ERROR) - buf = uvc_queue_next_buffer(&video->queue, buf); + buf = uvc_queue_next_buffer(&stream->queue, + buf); } while (ret == -EAGAIN); } } |