diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-24 18:43:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-24 18:43:11 -0300 |
| commit | d51c5dc0968d35384c2ee7960018457e81f72970 (patch) | |
| tree | 87d001a2123fdb5b1fec9570d1c5586ed1028c8f /linux/drivers/media/video/cx88/cx88-blackbird.c | |
| parent | 8541186fb1657556a4298819391bec45d26d6393 (diff) | |
| parent | 9b46c2b9f7db1a87a4ad91531c3e390a8b1317fc (diff) | |
| download | mediapointer-dvb-s2-d51c5dc0968d35384c2ee7960018457e81f72970.tar.gz mediapointer-dvb-s2-d51c5dc0968d35384c2ee7960018457e81f72970.tar.bz2 | |
merge: http://linuxtv.org/hg/~quincy/v4l-dvb-tuner-refactor
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-blackbird.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-blackbird.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c index e1e9580b2..f34a76511 100644 --- a/linux/drivers/media/video/cx88/cx88-blackbird.c +++ b/linux/drivers/media/video/cx88/cx88-blackbird.c @@ -1602,6 +1602,7 @@ static int mpeg_release(struct inode *inode, struct file *file) BLACKBIRD_RAW_BITS_NONE ); + cx8802_cancel_buffers(fh->dev); /* stop mpeg capture */ if (fh->mpegq.streaming) videobuf_streamoff(&fh->mpegq); @@ -1719,12 +1720,25 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev, memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params)); memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params)); - if (core->tuner_formats & V4L2_STD_525_60) { - dev->height = 480; - dev->params.vi_frame_rate = 30; - } else { - dev->height = 576; - dev->params.vi_frame_rate = 25; + switch (core->board) { + case CX88_BOARD_HAUPPAUGE_ROSLYN: + if (core->tuner_formats & V4L2_STD_525_60) { + dev->height = 480; + dev->params.vi_frame_rate = 30; + } else { + dev->height = 576; + dev->params.vi_frame_rate = 25; + } + break; + case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT: + if (core->tvnorm->id & V4L2_STD_525_60) { + dev->height = 480; + dev->params.vi_frame_rate = 30; + } else { + dev->height = 576; + dev->params.vi_frame_rate = 25; + } + break; } err = cx8802_init_common(dev); |