5 files changed, 75 insertions, 20 deletions

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index ddc5402c5fb0..a2e3f6729c5b 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -4606,6 +4606,43 @@ struct saa7134_board saa7134_boards[] = {
                         .gpio   = 0x0200000,
                 },
         },
+        [SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG] = {
+                .name           = "Kworld Plus TV Analog Lite PCI",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_YMEC_TVF_5533MF,
+                .radio_type     = TUNER_TEA5767,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 0x80000700,
+                .inputs = { {
+                        .name   = name_tv,
+                        .vmux   = 1,
+                        .amux   = LINE2,
+                        .tv     = 1,
+                        .gpio   = 0x100,
+                }, {
+                        .name   = name_comp1,
+                        .vmux   = 3,
+                        .amux   = LINE1,
+                        .gpio   = 0x200,
+                }, {
+                        .name   = name_svideo,
+                        .vmux   = 8,
+                        .amux   = LINE1,
+                        .gpio   = 0x200,
+                } },
+                .radio = {
+                        .name   = name_radio,
+                        .vmux   = 1,
+                        .amux   = LINE1,
+                        .gpio   = 0x100,
+                },
+                .mute = {
+                        .name = name_mute,
+                        .vmux = 8,
+                        .amux = 2,
+                },
+        },
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -4736,6 +4773,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .driver_data  = SAA7134_BOARD_MD7134,
         },{
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = 0x16be, /* CTX946 analog TV, HW mpeg, DVB-T */
+                .subdevice    = 0x5000, /* only analog TV and DVB-T for now */
+                .driver_data  = SAA7134_BOARD_MD7134,
+        }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
                 .subvendor    = 0x1048,
                 .subdevice    = 0x226b,
@@ -5653,6 +5696,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subdevice    = 0x4878, /* REV:1.02G */
                 .driver_data  = SAA7134_BOARD_ASUSTeK_TIGER_3IN1,
         }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = 0x17de,
+                .subdevice    = 0x7128,
+                .driver_data  = SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG,
+        }, {
                 /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -5880,6 +5929,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_BEHOLD_507_9FM:
         case SAA7134_BOARD_GENIUS_TVGO_A11MCE:
         case SAA7134_BOARD_REAL_ANGEL_220:
+        case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG:
                 dev->has_remote = SAA7134_REMOTE_GPIO;
                 break;
         case SAA7134_BOARD_FLYDVBS_LR300:
@@ -6048,7 +6098,7 @@ static void saa7134_tuner_setup(struct saa7134_dev *dev)
                 struct v4l2_priv_tun_config  xc2028_cfg;
                 struct xc2028_ctrl           ctl;
 
-                memset(&xc2028_cfg, 0, sizeof(ctl));
+                memset(&xc2028_cfg, 0, sizeof(xc2028_cfg));
                 memset(&ctl, 0, sizeof(ctl));
 
                 ctl.fname   = XC2028_DEFAULT_FIRMWARE;
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 8c46115d4c79..d9a5652595b5 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -954,20 +954,14 @@ static int dvb_init(struct saa7134_dev *dev)
         /* FIXME: add support for multi-frontend */
         mutex_init(&dev->frontends.lock);
         INIT_LIST_HEAD(&dev->frontends.felist);
-        dev->frontends.active_fe_id = 0;
 
         printk(KERN_INFO "%s() allocating 1 frontend\n", __func__);
-
-        if (videobuf_dvb_alloc_frontend(&dev->frontends, 1) == NULL) {
+        fe0 = videobuf_dvb_alloc_frontend(&dev->frontends, 1);
+        if (!fe0) {
                 printk(KERN_ERR "%s() failed to alloc\n", __func__);
                 return -ENOMEM;
         }
 
-        /* Get the first frontend */
-        fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1);
-        if (!fe0)
-                return -EINVAL;
-
         /* init struct videobuf_dvb */
         dev->ts.nr_bufs    = 32;
         dev->ts.nr_packets = 32*4;
@@ -1376,7 +1370,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 };
 
                 if (!fe0->dvb.frontend)
-                        return -1;
+                        goto dettach_frontend;
 
                 fe = dvb_attach(xc2028_attach, fe0->dvb.frontend, &cfg);
                 if (!fe) {
@@ -1388,7 +1382,7 @@ static int dvb_init(struct saa7134_dev *dev)
 
         if (NULL == fe0->dvb.frontend) {
                 printk(KERN_ERR "%s/dvb: frontend initialization failed\n", dev->name);
-                return -1;
+                goto dettach_frontend;
         }
         /* define general-purpose callback pointer */
         fe0->dvb.frontend->callback = saa7134_tuner_callback;
@@ -1411,11 +1405,8 @@ static int dvb_init(struct saa7134_dev *dev)
         return ret;
 
 dettach_frontend:
-        if (fe0->dvb.frontend)
-                dvb_frontend_detach(fe0->dvb.frontend);
-        fe0->dvb.frontend = NULL;
-
-        return -1;
+        videobuf_dvb_dealloc_frontends(&dev->frontends);
+        return -EINVAL;
 }
 
 static int dvb_fini(struct saa7134_dev *dev)
@@ -1454,8 +1445,7 @@ static int dvb_fini(struct saa7134_dev *dev)
                         }
                 }
         }
-        if (fe0->dvb.frontend)
-                videobuf_dvb_unregister_bus(&dev->frontends);
+        videobuf_dvb_unregister_bus(&dev->frontends);
         return 0;
 }
 
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index c53fd5f9f6b5..d2124f64e4e2 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -97,6 +97,15 @@ static int build_key(struct saa7134_dev *dev)
         dprintk("build_key gpio=0x%x mask=0x%x data=%d\n",
                 gpio, ir->mask_keycode, data);
 
+        switch (dev->board) {
+        case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG:
+                if (data == ir->mask_keycode)
+                        ir_input_nokey(ir->dev, &ir->ir);
+                else
+                        ir_input_keydown(ir->dev, &ir->ir, data, data);
+                return 0;
+        }
+
         if (ir->polling) {
                 if ((ir->mask_keydown  &&  (0 != (gpio & ir->mask_keydown))) ||
                     (ir->mask_keyup    &&  (0 == (gpio & ir->mask_keyup)))) {
@@ -586,6 +595,11 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keyup   = 0x4000;
                 polling = 50; /* ms */
                 break;
+        case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG:
+                ir_codes     = ir_codes_kworld_plus_tv_analog;
+                mask_keycode = 0x7f;
+                polling = 40; /* ms */
+                break;
         }
         if (NULL == ir_codes) {
                 printk("%s: Oops: IR config error [card=%d]\n",
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index c5d0b44c179e..76b16407b01e 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -159,7 +159,7 @@ static struct saa7134_tvaudio tvaudio[] = {
                 .mode          = TVAUDIO_FM_MONO,
         }
 };
-#define TVAUDIO (sizeof(tvaudio)/sizeof(struct saa7134_tvaudio))
+#define TVAUDIO ARRAY_SIZE(tvaudio)
 
 /* ------------------------------------------------------------------ */
 
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 24096d6e1ef8..f6c1fcc72070 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -275,8 +275,9 @@ struct saa7134_format {
 #define SAA7134_BOARD_REAL_ANGEL_220     150
 #define SAA7134_BOARD_ADS_INSTANT_HDTV_PCI  151
 #define SAA7134_BOARD_ASUSTeK_TIGER         152
+#define SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG 153
 
-#define SAA7134_MAXBOARDS 8
+#define SAA7134_MAXBOARDS 32
 #define SAA7134_INPUT_MAX 8
 
 /* ----------------------------------------------------------- */