Sfoglia il codice sorgente

V4L/DVB (3806): Cx88-blackbird: allow proper detection of PAL vs. NTSC video standard

- removed test for CX88_BOARD_HAUPPAUGE_ROSLYN prior to determining whether
  the video standard in use is NTSC or PAL.
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Michael Krufky 19 anni fa
parent
commit
707f813729
1 ha cambiato i file con 6 aggiunte e 10 eliminazioni
  1. 6 10
      drivers/media/video/cx88/cx88-blackbird.c

+ 6 - 10
drivers/media/video/cx88/cx88-blackbird.c

@@ -1686,16 +1686,12 @@ 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->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;
-		}
-
+	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);