---

yaml --- r: 29867 b: refs/heads/master c: 01a9cd9 h: refs/heads/master i: 29865: b2c9a68 29863: e7a4b18 v: v3
git-mirror · Jun 25, 2006 · 3016157 · 3016157
1 parent 6d781a3
commit 3016157
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c344933af5a8610d71bd0d92fe43a1519ed72ed8
+refs/heads/master: 01a9cd99cfd5b91ca38df74db60629d76e83cb94
diff --git a/trunk/drivers/media/video/cx88/cx88-blackbird.c b/trunk/drivers/media/video/cx88/cx88-blackbird.c
@@ -1686,16 +1686,25 @@ 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) {
-
+	switch (core->board) {
+	case 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;
 		}
-
+		break;
+	case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
+		if (core->tvnorm->id & V4L2_STD_525_60) {
+			dev->height = 480;
+			dev->params.vi_frame_rate = 30;
+		} else {
+			dev->height = 576;
+			dev->params.vi_frame_rate = 25;
+		}
+		break;
 	}
 
 	err = cx8802_init_common(dev);