diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-06-22 20:47:07 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 01:05:24 -0400 |
| commit | 45f87a21735804760dd7db0e2e3c609c332b15e3 (patch) | |
| tree | d5902f45a9c7e06d0ee086cb7a001daf3f7e4e49 /drivers/media/video | |
| parent | 153962364dc6fa4a24571885fbe76506d8968610 (diff) | |
V4L/DVB (4206): Cx88-blackbird: always set encoder height based on tvnorm->id
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/cx88/cx88-blackbird.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 26aac42ca8bd..67fd3302e8f2 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
| @@ -1045,21 +1045,10 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev, | |||
| 1045 | cx2341x_fill_defaults(&dev->params); | 1045 | cx2341x_fill_defaults(&dev->params); |
| 1046 | dev->params.port = CX2341X_PORT_STREAMING; | 1046 | dev->params.port = CX2341X_PORT_STREAMING; |
| 1047 | 1047 | ||
| 1048 | switch (core->board) { | 1048 | if (core->tvnorm->id & V4L2_STD_525_60) { |
| 1049 | case CX88_BOARD_HAUPPAUGE_ROSLYN: | 1049 | dev->height = 480; |
| 1050 | if (core->tuner_formats & V4L2_STD_525_60) { | 1050 | } else { |
| 1051 | dev->height = 480; | 1051 | dev->height = 576; |
| 1052 | } else { | ||
| 1053 | dev->height = 576; | ||
| 1054 | } | ||
| 1055 | break; | ||
| 1056 | case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT: | ||
| 1057 | if (core->tvnorm->id & V4L2_STD_525_60) { | ||
| 1058 | dev->height = 480; | ||
| 1059 | } else { | ||
| 1060 | dev->height = 576; | ||
| 1061 | } | ||
| 1062 | break; | ||
| 1063 | } | 1052 | } |
| 1064 | 1053 | ||
| 1065 | err = cx8802_init_common(dev); | 1054 | err = cx8802_init_common(dev); |