From 9be1effb78a38d5b5986039eb56f09d717e9f33f Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 13 Apr 2006 17:41:52 -0300 Subject: [PATCH] --- yaml --- r: 29861 b: refs/heads/master c: 707f813729a87e4368532e0a53349192ddabb2e1 h: refs/heads/master i: 29859: f2e2f82a407d8871cf0efd2c052b405b30c02d2a v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-blackbird.c | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 4571f086e75d..b9eabcbf8140 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 473f54276a814810d4a06616b223a7d6829e1ad5 +refs/heads/master: 707f813729a87e4368532e0a53349192ddabb2e1 diff --git a/trunk/drivers/media/video/cx88/cx88-blackbird.c b/trunk/drivers/media/video/cx88/cx88-blackbird.c index e100d8ef369a..b38382343b18 100644 --- a/trunk/drivers/media/video/cx88/cx88-blackbird.c +++ b/trunk/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);