Commit 707f8137 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil@xs4all.nl>

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 473f5427

drivers/media/video/cx88/cx88-blackbird.c

+6 −10
Original line number Diff line number Diff line
@@ -1686,8 +1686,6 @@ 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;
@@ -1696,8 +1694,6 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev, 
		dev->params.vi_frame_rate = 25;

	}



	}



	err = cx8802_init_common(dev);

	if (0 != err)

		goto fail_free;