---

yaml --- r: 29861 b: refs/heads/master c: 707f813 h: refs/heads/master i: 29859: f2e2f82 v: v3
git-mirror · Jun 25, 2006 · 9be1eff · 9be1eff
1 parent 1ca48f1
commit 9be1eff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git 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
@@ -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);