3 files changed, 12 insertions, 6 deletions

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 6ec4a34aeacc..75ee8358f1cb 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1686,12 +1686,16 @@ 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->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->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;
+                }
+
         }
 
         err = cx8802_init_common(dev);
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 344c16eb0b0d..9516c4081192 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1071,6 +1071,7 @@ struct cx88_board cx88_boards[] = {
                         .gpio0  = 0x3de6,
                         .gpio2  = 0x00ff,
                 },
+                .blackbird      = 1,
         },
         [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = {
                 .name           = "DViCO FusionHDTV DVB-T Hybrid",
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 210f9f7ebed4..04d0635695d7 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -151,6 +151,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
                 switch (core->board) {
                 case CX88_BOARD_HAUPPAUGE_ROSLYN:
                 case CX88_BOARD_KWORLD_MCE200_DELUXE:
+                case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
                         cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
                         break;
                 default: