diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-25 01:07:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-25 01:07:17 -0300 |
| commit | 1012e50d3f53435f01b9af729ef23125eb4cc6e2 (patch) | |
| tree | 44233e4c0cc90db2e5c03083cbde03533d7755be /linux/drivers/media/video/cx88/cx88-video.c | |
| parent | e9af8370a92c5280ed2470c72b3a4dbbd1e3b9b2 (diff) | |
| parent | 09a7c4d4e9d8120b3ec951bb9ab3ae040da8ad94 (diff) | |
| download | mediapointer-dvb-s2-1012e50d3f53435f01b9af729ef23125eb4cc6e2.tar.gz mediapointer-dvb-s2-1012e50d3f53435f01b9af729ef23125eb4cc6e2.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index b80236f04..8d168c7f0 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1017,14 +1017,14 @@ static int video_open(struct inode *inode, struct file *file) fh->height = 240; fh->fmt = format_by_fourcc(V4L2_PIX_FMT_BGR24); - videobuf_queue_pci_init(&fh->vidq, &cx8800_video_qops, - dev->pci, &dev->slock, + videobuf_queue_sg_init(&fh->vidq, &cx8800_video_qops, + &dev->pci->dev, &dev->slock, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_INTERLACED, sizeof(struct cx88_buffer), fh); - videobuf_queue_pci_init(&fh->vbiq, &cx8800_vbi_qops, - dev->pci, &dev->slock, + videobuf_queue_sg_init(&fh->vbiq, &cx8800_vbi_qops, + &dev->pci->dev, &dev->slock, V4L2_BUF_TYPE_VBI_CAPTURE, V4L2_FIELD_SEQ_TB, sizeof(struct cx88_buffer), |