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>

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index e100d8ef369a250155cde5378c999a98201ba39b..b38382343b18228a9fb7baa6a27ffa7b8520e940 100644 (file)
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/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);