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>
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 26aac42..67fd330 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1045,21 +1045,10 @@
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);