8 files changed, 99 insertions, 205 deletions

diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
index 309dca368f4a..9f1417a4f7d2 100644
--- a/drivers/media/video/saa7134/Kconfig
+++ b/drivers/media/video/saa7134/Kconfig
@@ -40,7 +40,7 @@ config VIDEO_SAA7134_DVB
         depends on VIDEO_SAA7134 && DVB_CORE
         select VIDEO_BUF_DVB
         select FW_LOADER
-        select DVB_PLL
+        select DVB_PLL if !DVB_FE_CUSTOMISE
         select DVB_MT352 if !DVB_FE_CUSTOMISE
         select DVB_TDA1004X if !DVB_FE_CUSTOMISE
         select DVB_NXT200X if !DVB_FE_CUSTOMISE
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index ffb0f647a86d..3c0fc9027ad0 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -75,7 +75,8 @@ typedef struct snd_card_saa7134 {
         struct saa7134_dev *dev;
 
         unsigned long iobase;
-        int irq;
+        s16 irq;
+        u16 mute_was_on;
 
         spinlock_t lock;
 } snd_card_saa7134_t;
@@ -589,8 +590,10 @@ static int snd_card_saa7134_capture_close(struct snd_pcm_substream * substream)
         snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream);
         struct saa7134_dev *dev = saa7134->dev;
 
-        dev->ctl_mute = 1;
-        saa7134_tvaudio_setmute(dev);
+        if (saa7134->mute_was_on) {
+                dev->ctl_mute = 1;
+                saa7134_tvaudio_setmute(dev);
+        }
         return 0;
 }
 
@@ -637,8 +640,11 @@ static int snd_card_saa7134_capture_open(struct snd_pcm_substream * substream)
         runtime->private_free = snd_card_saa7134_runtime_free;
         runtime->hw = snd_card_saa7134_capture;
 
-        dev->ctl_mute = 0;
-        saa7134_tvaudio_setmute(dev);
+        if (dev->ctl_mute != 0) {
+                saa7134->mute_was_on = 1;
+                dev->ctl_mute = 0;
+                saa7134_tvaudio_setmute(dev);
+        }
 
         if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
                 return err;
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 50f15adfa7c8..8ec83bd70094 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -400,7 +400,7 @@ struct saa7134_board saa7134_boards[] = {
                 .inputs         = {{
                         .name = name_tv,
                         .vmux = 1,
-                        .amux = LINE2,
+                        .amux = TV,
                         .tv   = 1,
                         .gpio = 0x20000,
                 },{
@@ -3502,6 +3502,38 @@ struct saa7134_board saa7134_boards[] = {
                         .amux = TV,
                 },
         },
+        [SAA7134_BOARD_10MOONSTVMASTER3] = {
+                /* Tony Wan <aloha_cn@hotmail.com> */
+                .name           = "10MOONS TM300 TV Card",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_LG_PAL_NEW_TAPC,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 0x7000,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = LINE2,
+                        .gpio = 0x0000,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                        .gpio = 0x2000,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                        .gpio = 0x2000,
+                }},
+                .mute = {
+                        .name = name_mute,
+                        .amux = LINE2,
+                        .gpio = 0x3000,
+                },
+        },
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -4219,6 +4251,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subdevice    = 0x2003, /* OEM cardbus */
                 .driver_data  = SAA7134_BOARD_SABRENT_TV_PCB05,
         },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = PCI_VENDOR_ID_PHILIPS,
+                .subdevice    = 0x2304,
+                .driver_data  = SAA7134_BOARD_10MOONSTVMASTER3,
+        },{
                 /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -4330,6 +4368,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
         case SAA7134_BOARD_AVERMEDIA_A16AR:
         case SAA7134_BOARD_ENCORE_ENLTV:
         case SAA7134_BOARD_ENCORE_ENLTV_FM:
+        case SAA7134_BOARD_10MOONSTVMASTER3:
                 dev->has_remote = SAA7134_REMOTE_GPIO;
                 break;
         case SAA7134_BOARD_FLYDVBS_LR300:
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index e0eec80088c7..1f6bd3300715 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -175,18 +175,6 @@ static int mt352_pinnacle_tuner_set_params(struct dvb_frontend* fe,
         return mt352_pinnacle_init(fe);
 }
 
-static int mt352_aver777_tuner_calc_regs(struct dvb_frontend *fe, struct dvb_frontend_parameters *params, u8* pllbuf, int buf_len)
-{
-        if (buf_len < 5)
-                return -EINVAL;
-
-        pllbuf[0] = 0x61;
-        dvb_pll_configure(&dvb_pll_philips_td1316, pllbuf+1,
-                          params->frequency,
-                          params->u.ofdm.bandwidth);
-        return 5;
-}
-
 static struct mt352_config pinnacle_300i = {
         .demod_address = 0x3c >> 1,
         .adc_clock     = 20333,
@@ -444,135 +432,6 @@ static struct tda1004x_config philips_europa_config = {
 
 /* ------------------------------------------------------------------ */
 
-static int philips_fmd1216_tuner_init(struct dvb_frontend *fe)
-{
-        struct saa7134_dev *dev = fe->dvb->priv;
-        struct tda1004x_state *state = fe->demodulator_priv;
-        u8 addr = state->config->tuner_address;
-        /* this message is to set up ATC and ALC */
-        static u8 fmd1216_init[] = { 0x0b, 0xdc, 0x9c, 0xa0 };
-        struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = fmd1216_init,.len = sizeof(fmd1216_init) };
-
-        if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
-        if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1)
-                return -EIO;
-        msleep(1);
-
-        return 0;
-}
-
-static int philips_fmd1216_tuner_sleep(struct dvb_frontend *fe)
-{
-        struct saa7134_dev *dev = fe->dvb->priv;
-        struct tda1004x_state *state = fe->demodulator_priv;
-        u8 addr = state->config->tuner_address;
-        /* this message actually turns the tuner back to analog mode */
-        u8 fmd1216_init[] = { 0x0b, 0xdc, 0x9c, 0x60 };
-        struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = fmd1216_init,.len = sizeof(fmd1216_init) };
-
-        if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
-        i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
-        msleep(1);
-        fmd1216_init[2] = 0x86;
-        fmd1216_init[3] = 0x54;
-        if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
-        i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
-        msleep(1);
-        return 0;
-}
-
-static int philips_fmd1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
-{
-        struct saa7134_dev *dev = fe->dvb->priv;
-        struct tda1004x_state *state = fe->demodulator_priv;
-        u8 addr = state->config->tuner_address;
-        u8 tuner_buf[4];
-        struct i2c_msg tuner_msg = {.addr = addr,.flags = 0,.buf = tuner_buf,.len =
-                        sizeof(tuner_buf) };
-        int tuner_frequency = 0;
-        int divider = 0;
-        u8 band, mode, cp;
-
-        /* determine charge pump */
-        tuner_frequency = params->frequency + 36130000;
-        if (tuner_frequency < 87000000)
-                return -EINVAL;
-        /* low band */
-        else if (tuner_frequency < 180000000) {
-                band = 1;
-                mode = 7;
-                cp   = 0;
-        } else if (tuner_frequency < 195000000) {
-                band = 1;
-                mode = 6;
-                cp   = 1;
-        /* mid band     */
-        } else if (tuner_frequency < 366000000) {
-                if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ) {
-                        band = 10;
-                } else {
-                        band = 2;
-                }
-                mode = 7;
-                cp   = 0;
-        } else if (tuner_frequency < 478000000) {
-                if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ) {
-                        band = 10;
-                } else {
-                        band = 2;
-                }
-                mode = 6;
-                cp   = 1;
-        /* high band */
-        } else if (tuner_frequency < 662000000) {
-                if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ) {
-                        band = 12;
-                } else {
-                        band = 4;
-                }
-                mode = 7;
-                cp   = 0;
-        } else if (tuner_frequency < 840000000) {
-                if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ) {
-                        band = 12;
-                } else {
-                        band = 4;
-                }
-                mode = 6;
-                cp   = 1;
-        } else {
-                if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ) {
-                        band = 12;
-                } else {
-                        band = 4;
-                }
-                mode = 7;
-                cp   = 1;
-
-        }
-        /* calculate divisor */
-        /* ((36166000 + Finput) / 166666) rounded! */
-        divider = (tuner_frequency + 83333) / 166667;
-
-        /* setup tuner buffer */
-        tuner_buf[0] = (divider >> 8) & 0x7f;
-        tuner_buf[1] = divider & 0xff;
-        tuner_buf[2] = 0x80 | (cp << 6) | (mode  << 3) | 4;
-        tuner_buf[3] = 0x40 | band;
-
-        if (fe->ops.i2c_gate_ctrl)
-                fe->ops.i2c_gate_ctrl(fe, 1);
-        if (i2c_transfer(&dev->i2c_adap, &tuner_msg, 1) != 1) {
-                wprintk("could not write to tuner at addr: 0x%02x\n",
-                        addr << 1);
-                return -EIO;
-        }
-        return 0;
-}
-
 static struct tda1004x_config medion_cardbus = {
         .demod_address = 0x08,
         .invert        = 1,
@@ -958,18 +817,8 @@ static struct nxt200x_config avertvhda180 = {
         .demod_address    = 0x0a,
 };
 
-static int nxt200x_set_pll_input(u8 *buf, int input)
-{
-        if (input)
-                buf[3] |= 0x08;
-        else
-                buf[3] &= ~0x08;
-        return 0;
-}
-
 static struct nxt200x_config kworldatsc110 = {
         .demod_address    = 0x0a,
-        .set_pll_input    = nxt200x_set_pll_input,
 };
 
 /* ==================================================================
@@ -1005,7 +854,8 @@ static int dvb_init(struct saa7134_dev *dev)
                 dev->dvb.frontend = dvb_attach(mt352_attach, &avermedia_777,
                                                &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops.tuner_ops.calc_regs = mt352_aver777_tuner_calc_regs;
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
+                                   NULL, DVB_PLL_PHILIPS_TD1316);
                 }
                 break;
         case SAA7134_BOARD_MD7134:
@@ -1013,9 +863,8 @@ static int dvb_init(struct saa7134_dev *dev)
                                                &medion_cardbus,
                                                &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init;
-                        dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep;
-                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_fmd1216_tuner_set_params;
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, medion_cardbus.tuner_address,
+                                   &dev->i2c_adap, DVB_PLL_FMD1216ME);
                 }
                 break;
         case SAA7134_BOARD_PHILIPS_TOUGH:
@@ -1113,7 +962,7 @@ static int dvb_init(struct saa7134_dev *dev)
                                                &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   NULL, &dvb_pll_tdhu2);
+                                   NULL, DVB_PLL_TDHU2);
                 }
                 break;
         case SAA7134_BOARD_KWORLD_ATSC110:
@@ -1121,7 +970,7 @@ static int dvb_init(struct saa7134_dev *dev)
                                                &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   NULL, &dvb_pll_tuv1236d);
+                                   NULL, DVB_PLL_TUV1236D);
                 }
                 break;
         case SAA7134_BOARD_FLYDVBS_LR300:
@@ -1144,9 +993,9 @@ static int dvb_init(struct saa7134_dev *dev)
                 if (dev->dvb.frontend) {
                         dev->original_demod_sleep = dev->dvb.frontend->ops.sleep;
                         dev->dvb.frontend->ops.sleep = philips_europa_demod_sleep;
-                        dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init;
-                        dev->dvb.frontend->ops.tuner_ops.sleep = philips_fmd1216_tuner_sleep;
-                        dev->dvb.frontend->ops.tuner_ops.set_params = philips_fmd1216_tuner_set_params;
+
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, medion_cardbus.tuner_address,
+                                   &dev->i2c_adap, DVB_PLL_FMD1216ME);
                 }
                 break;
         case SAA7134_BOARD_VIDEOMATE_DVBT_200A:
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index f521603482ca..fc260ec8fdc2 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -96,6 +96,10 @@ static int ts_open(struct inode *inode, struct file *file)
         if (dev->empress_users)
                 goto done_up;
 
+        /* Unmute audio */
+        saa_writeb(SAA7134_AUDIO_MUTE_CTRL,
+                saa_readb(SAA7134_AUDIO_MUTE_CTRL) & ~(1 << 6));
+
         dev->empress_users++;
         file->private_data = dev;
         err = 0;
@@ -121,6 +125,10 @@ static int ts_release(struct inode *inode, struct file *file)
         /* stop the encoder */
         ts_reset_encoder(dev);
 
+        /* Mute audio */
+        saa_writeb(SAA7134_AUDIO_MUTE_CTRL,
+                saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 << 6));
+
         mutex_unlock(&dev->empress_tsq.lock);
         return 0;
 }
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index c0de37e3f5c6..1b6dfd801cc1 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -153,21 +153,18 @@ void saa7134_input_irq(struct saa7134_dev *dev)
 
 static void saa7134_input_timer(unsigned long data)
 {
-        struct saa7134_dev *dev = (struct saa7134_dev*)data;
+        struct saa7134_dev *dev = (struct saa7134_dev *)data;
         struct card_ir *ir = dev->remote;
-        unsigned long timeout;
 
         build_key(dev);
-        timeout = jiffies + (ir->polling * HZ / 1000);
-        mod_timer(&ir->timer, timeout);
+        mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
 }
 
 static void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir)
 {
         if (ir->polling) {
-                init_timer(&ir->timer);
-                ir->timer.function = saa7134_input_timer;
-                ir->timer.data     = (unsigned long)dev;
+                setup_timer(&ir->timer, saa7134_input_timer,
+                            (unsigned long)dev);
                 ir->timer.expires  = jiffies + HZ;
                 add_timer(&ir->timer);
         } else if (ir->rc5_gpio) {
@@ -314,6 +311,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keycode = 0x003F00;
                 mask_keyup   = 0x040000;
                 break;
+        case SAA7134_BOARD_FLYDVBS_LR300:
         case SAA7134_BOARD_FLYDVBT_LR301:
         case SAA7134_BOARD_FLYDVBTDUO:
                 ir_codes     = ir_codes_flydvb;
@@ -333,6 +331,12 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 mask_keyup   = 0x040000;
                 polling      = 50; // ms
                 break;
+        case SAA7134_BOARD_10MOONSTVMASTER3:
+                ir_codes     = ir_codes_encore_enltv;
+                mask_keycode = 0x5f80000;
+                mask_keyup   = 0x8000000;
+                polling      = 50; //ms
+                break;
         }
         if (NULL == ir_codes) {
                 printk("%s: Oops: IR config error [card=%d]\n",
@@ -374,7 +378,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
                 input_dev->id.vendor  = dev->pci->vendor;
                 input_dev->id.product = dev->pci->device;
         }
-        input_dev->cdev.dev = &dev->pci->dev;
+        input_dev->dev.parent = &dev->pci->dev;
 
         dev->remote = ir;
         saa7134_ir_start(dev, ir);
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
index 30395d6b5f14..18b4817b4aac 100644
--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
+#include <linux/kthread.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <asm/div64.h>
@@ -341,10 +342,8 @@ static void tvaudio_setmode(struct saa7134_dev *dev,
 
 static int tvaudio_sleep(struct saa7134_dev *dev, int timeout)
 {
-        DECLARE_WAITQUEUE(wait, current);
-
-        add_wait_queue(&dev->thread.wq, &wait);
-        if (dev->thread.scan1 == dev->thread.scan2 && !dev->thread.shutdown) {
+        if (dev->thread.scan1 == dev->thread.scan2 &&
+            !kthread_should_stop()) {
                 if (timeout < 0) {
                         set_current_state(TASK_INTERRUPTIBLE);
                         schedule();
@@ -353,7 +352,6 @@ static int tvaudio_sleep(struct saa7134_dev *dev, int timeout)
                                                 (msecs_to_jiffies(timeout));
                 }
         }
-        remove_wait_queue(&dev->thread.wq, &wait);
         return dev->thread.scan1 != dev->thread.scan2;
 }
 
@@ -505,11 +503,10 @@ static int tvaudio_thread(void *data)
         unsigned int i, audio, nscan;
         int max1,max2,carrier,rx,mode,lastmode,default_carrier;
 
-        daemonize("%s", dev->name);
         allow_signal(SIGTERM);
         for (;;) {
                 tvaudio_sleep(dev,-1);
-                if (dev->thread.shutdown || signal_pending(current))
+                if (kthread_should_stop() || signal_pending(current))
                         goto done;
 
         restart:
@@ -618,7 +615,7 @@ static int tvaudio_thread(void *data)
                 for (;;) {
                         if (tvaudio_sleep(dev,5000))
                                 goto restart;
-                        if (dev->thread.shutdown || signal_pending(current))
+                        if (kthread_should_stop() || signal_pending(current))
                                 break;
                         if (UNSET == dev->thread.mode) {
                                 rx = tvaudio_getstereo(dev,&tvaudio[i]);
@@ -634,7 +631,6 @@ static int tvaudio_thread(void *data)
         }
 
  done:
-        complete_and_exit(&dev->thread.exit, 0);
         return 0;
 }
 
@@ -782,7 +778,6 @@ static int tvaudio_thread_ddep(void *data)
         struct saa7134_dev *dev = data;
         u32 value, norms, clock;
 
-        daemonize("%s", dev->name);
         allow_signal(SIGTERM);
 
         clock = saa7134_boards[dev->board].audio_clock;
@@ -796,7 +791,7 @@ static int tvaudio_thread_ddep(void *data)
 
         for (;;) {
                 tvaudio_sleep(dev,-1);
-                if (dev->thread.shutdown || signal_pending(current))
+                if (kthread_should_stop() || signal_pending(current))
                         goto done;
 
         restart:
@@ -876,7 +871,6 @@ static int tvaudio_thread_ddep(void *data)
         }
 
  done:
-        complete_and_exit(&dev->thread.exit, 0);
         return 0;
 }
 
@@ -973,7 +967,6 @@ int saa7134_tvaudio_getstereo(struct saa7134_dev *dev)
 
 int saa7134_tvaudio_init2(struct saa7134_dev *dev)
 {
-        DECLARE_MUTEX_LOCKED(sem);
         int (*my_thread)(void *data) = NULL;
 
         switch (dev->pci->device) {
@@ -986,15 +979,15 @@ int saa7134_tvaudio_init2(struct saa7134_dev *dev)
                 break;
         }
 
-        dev->thread.pid = -1;
+        dev->thread.thread = NULL;
         if (my_thread) {
                 /* start tvaudio thread */
-                init_waitqueue_head(&dev->thread.wq);
-                init_completion(&dev->thread.exit);
-                dev->thread.pid = kernel_thread(my_thread,dev,0);
-                if (dev->thread.pid < 0)
+                dev->thread.thread = kthread_run(my_thread, dev, "%s", dev->name);
+                if (IS_ERR(dev->thread.thread)) {
                         printk(KERN_WARNING "%s: kernel_thread() failed\n",
                                dev->name);
+                        /* XXX: missing error handling here */
+                }
                 saa7134_tvaudio_do_scan(dev);
         }
 
@@ -1005,11 +998,9 @@ int saa7134_tvaudio_init2(struct saa7134_dev *dev)
 int saa7134_tvaudio_fini(struct saa7134_dev *dev)
 {
         /* shutdown tvaudio thread */
-        if (dev->thread.pid > 0) {
-                dev->thread.shutdown = 1;
-                wake_up_interruptible(&dev->thread.wq);
-                wait_for_completion(&dev->thread.exit);
-        }
+        if (dev->thread.thread)
+                kthread_stop(dev->thread.thread);
+
         saa_andorb(SAA7134_ANALOG_IO_SELECT, 0x07, 0x00); /* LINE1 */
         return 0;
 }
@@ -1020,10 +1011,10 @@ int saa7134_tvaudio_do_scan(struct saa7134_dev *dev)
                 dprintk("sound IF not in use, skipping scan\n");
                 dev->automute = 0;
                 saa7134_tvaudio_setmute(dev);
-        } else if (dev->thread.pid >= 0) {
+        } else if (dev->thread.thread) {
                 dev->thread.mode = UNSET;
                 dev->thread.scan2++;
-                wake_up_interruptible(&dev->thread.wq);
+                wake_up_process(dev->thread.thread);
         } else {
                 dev->automute = 0;
                 saa7134_tvaudio_setmute(dev);
@@ -1040,4 +1031,3 @@ EXPORT_SYMBOL(saa7134_tvaudio_setmute);
  * c-basic-offset: 8
  * End:
  */
-
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 15623b27ad2e..d32a856192d7 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -238,6 +238,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_ECS_TVP3XP_4CB6  113
 #define SAA7134_BOARD_KWORLD_DVBT_210 114
 #define SAA7134_BOARD_SABRENT_TV_PCB05     115
+#define SAA7134_BOARD_10MOONSTVMASTER3     116
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8
@@ -327,10 +328,7 @@ struct saa7134_pgtable {
 
 /* tvaudio thread status */
 struct saa7134_thread {
-        pid_t                      pid;
-        struct completion          exit;
-        wait_queue_head_t          wq;
-        unsigned int               shutdown;
+        struct task_struct         *thread;
         unsigned int               scan1;
         unsigned int               scan2;
         unsigned int               mode;