diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-06-22 20:47:07 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-06-22 20:47:07 -0400 |
| commit | c8e0ee905cdfe4183f753600fcbbfe3114df03d5 (patch) | |
| tree | fec612b025d6c87c50c656bf504f53fadf8d3b5a /linux/drivers/media | |
| parent | c3c161df40114ed8f7c0a3bebd385c173919de18 (diff) | |
| download | mediapointer-dvb-s2-c8e0ee905cdfe4183f753600fcbbfe3114df03d5.tar.gz mediapointer-dvb-s2-c8e0ee905cdfe4183f753600fcbbfe3114df03d5.tar.bz2 | |
cx88-blackbird: always set encoder height based on tvnorm->id
From: Michael Krufky <mkrufky@linuxtv.org>
Removed the switch..case block in blackbird_probe for setting encoder height
based on video standard. All blackbird devices can rely on tvnorm->id to
retrieve this information from the cx2388x video decoder - tuner_formats
should not be used to determine the encoding video standard.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-blackbird.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c index d6d19a71e..b85dfe85e 100644 --- a/linux/drivers/media/video/cx88/cx88-blackbird.c +++ b/linux/drivers/media/video/cx88/cx88-blackbird.c @@ -1078,21 +1078,10 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev, cx2341x_fill_defaults(&dev->params); dev->params.port = CX2341X_PORT_STREAMING; - switch (core->board) { - case CX88_BOARD_HAUPPAUGE_ROSLYN: - if (core->tuner_formats & V4L2_STD_525_60) { - dev->height = 480; - } else { - dev->height = 576; - } - break; - case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT: - if (core->tvnorm->id & V4L2_STD_525_60) { - dev->height = 480; - } else { - dev->height = 576; - } - break; + if (core->tvnorm->id & V4L2_STD_525_60) { + dev->height = 480; + } else { + dev->height = 576; } err = cx8802_init_common(dev); |