diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-04-17 17:10:38 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-04-17 17:10:38 -0400 |
| commit | 2bc21bcdb502df4abb44c04f0f66b66e849894ba (patch) | |
| tree | f0fcca4b8acba0e1b6d9b6fd49e6422683dee0ce /linux/drivers/media/video/cx88 | |
| parent | 6ff9606bf157734998241b66ac10bb11b913401e (diff) | |
| download | mediapointer-dvb-s2-2bc21bcdb502df4abb44c04f0f66b66e849894ba.tar.gz mediapointer-dvb-s2-2bc21bcdb502df4abb44c04f0f66b66e849894ba.tar.bz2 | |
cx88-blackbird: revert video standard detection patch
From: Michael Krufky <mkrufky@linuxtv.org>
This patch reverts changeset 328131dbb141
This patch was wrong... a better solution will come shortly.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-blackbird.c | 16 |
1 files changed, 10 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..935706680 100644 --- a/linux/drivers/media/video/cx88/cx88-blackbird.c +++ b/linux/drivers/media/video/cx88/cx88-blackbird.c @@ -1719,12 +1719,16 @@ 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; + if (core->board == 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; + } + } err = cx8802_init_common(dev); |