From 30161571d787b6cf0aa8c59d210aa9f139b046bb Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 18 Apr 2006 00:22:09 -0300
Subject: [PATCH] --- yaml --- r: 29867 b: refs/heads/master c:
 01a9cd99cfd5b91ca38df74db60629d76e83cb94 h: refs/heads/master i:   29865:
 b2c9a68537a3827a65f878692ea1b8116335cdb2   29863:
 e7a4b18a81539a8f1cd5824fd4193807113284ed v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/media/video/cx88/cx88-blackbird.c | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7fecbb5df272..8f8c8fdafe12 100644
--- 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
index 75ee8358f1cb..be367c5c5293 100644
--- a/trunk/drivers/media/video/cx88/cx88-blackbird.c
+++ b/trunk/drivers/media/video/cx88/cx88-blackbird.c
@@ -1686,8 +1686,8 @@ 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;
@@ -1695,7 +1695,16 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
 			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);