Merge branch 'to_linus' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

9 files changed, 40 insertions, 30 deletions

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 992be0be6b1e..7dae91e5863c 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -176,6 +176,9 @@ static void init_av7110_av(struct av7110 *av7110)
                 }
         }
 
+        if (dev->pci->subsystem_vendor == 0x13c2 && dev->pci->subsystem_device == 0x000e)
+                av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, SpdifSwitch, 1, 0); // SPDIF on
+
         ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right);
         if (ret < 0)
                 printk("dvb-ttpci:cannot set volume :%d\n",ret);
diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h
index fedd20f9815d..2a5e87ba1052 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.h
+++ b/drivers/media/dvb/ttpci/av7110_hw.h
@@ -143,7 +143,8 @@ enum av7110_audio_command {
         MainSwitch,
         ADSwitch,
         SendDiSEqC,
-        SetRegister
+        SetRegister,
+        SpdifSwitch
 };
 
 enum av7110_request_command {
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index aea3f038cff6..5b93723a1768 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -333,24 +333,30 @@ static int set_input(struct i2c_client *client, enum cx25840_input input)
 
 static int set_v4lstd(struct i2c_client *client, v4l2_std_id std)
 {
-        u8 fmt;
-
-        switch (std) {
-        /* zero is autodetect */
-        case 0: fmt = 0x0; break;
-        /* default ntsc to ntsc-m */
-        case V4L2_STD_NTSC:
-        case V4L2_STD_NTSC_M: fmt = 0x1; break;
-        case V4L2_STD_NTSC_M_JP: fmt = 0x2; break;
-        case V4L2_STD_NTSC_443: fmt = 0x3; break;
-        case V4L2_STD_PAL: fmt = 0x4; break;
-        case V4L2_STD_PAL_M: fmt = 0x5; break;
-        case V4L2_STD_PAL_N: fmt = 0x6; break;
-        case V4L2_STD_PAL_Nc: fmt = 0x7; break;
-        case V4L2_STD_PAL_60: fmt = 0x8; break;
-        case V4L2_STD_SECAM: fmt = 0xc; break;
-        default:
-                return -ERANGE;
+        u8 fmt=0;       /* zero is autodetect */
+
+        /* First tests should be against specific std */
+        if (std & V4L2_STD_NTSC_M_JP) {
+                fmt=0x2;
+        } else if (std & V4L2_STD_NTSC_443) {
+                fmt=0x3;
+        } else if (std & V4L2_STD_PAL_M) {
+                fmt=0x5;
+        } else if (std & V4L2_STD_PAL_N) {
+                fmt=0x6;
+        } else if (std & V4L2_STD_PAL_Nc) {
+                fmt=0x7;
+        } else if (std & V4L2_STD_PAL_60) {
+                fmt=0x8;
+        } else {
+                /* Then, test against generic ones */
+                if (std & V4L2_STD_NTSC) {
+                        fmt=0x1;
+                } else if (std & V4L2_STD_PAL) {
+                        fmt=0x4;
+                } else if (std & V4L2_STD_SECAM) {
+                        fmt=0xc;
+                }
         }
 
         cx25840_and_or(client, 0x400, ~0xf, fmt);
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index ec11619f8ea9..0cfe75416ec6 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -39,7 +39,7 @@ MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
 #define em28xx_coredbg(fmt, arg...) do {\
         if (core_debug) \
                 printk(KERN_INFO "%s %s :"fmt, \
-                         dev->name, __FUNCTION__, ##arg); } while (0)
+                         dev->name, __FUNCTION__ , ##arg); } while (0)
 
 static unsigned int reg_debug;
 module_param(reg_debug,int,0644);
@@ -48,7 +48,7 @@ MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]");
 #define em28xx_regdbg(fmt, arg...) do {\
         if (reg_debug) \
                 printk(KERN_INFO "%s %s :"fmt, \
-                         dev->name, __FUNCTION__, ##arg); } while (0)
+                         dev->name, __FUNCTION__ , ##arg); } while (0)
 
 static unsigned int isoc_debug;
 module_param(isoc_debug,int,0644);
@@ -57,7 +57,7 @@ MODULE_PARM_DESC(isoc_debug,"enable debug messages [isoc transfers]");
 #define em28xx_isocdbg(fmt, arg...) do {\
         if (isoc_debug) \
                 printk(KERN_INFO "%s %s :"fmt, \
-                         dev->name, __FUNCTION__, ##arg); } while (0)
+                         dev->name, __FUNCTION__ , ##arg); } while (0)
 
 static int alt = EM28XX_PINOUT;
 module_param(alt, int, 0644);
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 29e21ad187cc..7f5603054f02 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -44,7 +44,7 @@ MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
                         printk(fmt, ##args); } while (0)
 #define dprintk2(lvl,fmt, args...) if (i2c_debug>=lvl) do{ \
                         printk(KERN_DEBUG "%s at %s: " fmt, \
-                        dev->name, __FUNCTION__, ##args); } while (0)
+                        dev->name, __FUNCTION__ , ##args); } while (0)
 
 /*
  * em2800_i2c_send_max4()
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 8ecaa0803e08..06d76879bde2 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -45,7 +45,7 @@
 #define em28xx_videodbg(fmt, arg...) do {\
         if (video_debug) \
                 printk(KERN_INFO "%s %s :"fmt, \
-                         dev->name, __FUNCTION__, ##arg); } while (0)
+                         dev->name, __FUNCTION__ , ##arg); } while (0)
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 1e2ee43db394..5c7a41ce69f3 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -392,18 +392,18 @@ extern const unsigned int em28xx_bcount;
 /* printk macros */
 
 #define em28xx_err(fmt, arg...) do {\
-        printk(KERN_ERR fmt, ##arg); } while (0)
+        printk(KERN_ERR fmt , ##arg); } while (0)
 
 #define em28xx_errdev(fmt, arg...) do {\
         printk(KERN_ERR "%s: "fmt,\
-                        dev->name, ##arg); } while (0)
+                        dev->name , ##arg); } while (0)
 
 #define em28xx_info(fmt, arg...) do {\
         printk(KERN_INFO "%s: "fmt,\
-                        dev->name, ##arg); } while (0)
+                        dev->name , ##arg); } while (0)
 #define em28xx_warn(fmt, arg...) do {\
         printk(KERN_WARNING "%s: "fmt,\
-                        dev->name, ##arg); } while (0)
+                        dev->name , ##arg); } while (0)
 
 inline static int em28xx_audio_source(struct em28xx *dev, int input)
 {
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index b24a26b065c2..953d5fec82d5 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -60,7 +60,7 @@ module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s).");
 
 #define dprintk(fmt, arg...)    if (debug) \
-        printk(KERN_DEBUG "%s/alsa: " fmt, dev->name, ## arg)
+        printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ##arg)
 
 
 
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index cd7cf1bd12b4..5ac235365dd8 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -206,7 +206,7 @@ hauppauge_tuner[] =
         { TUNER_ABSENT,        "TCL 2002MI_3H"},
         { TUNER_TCL_2002N,     "TCL 2002N 5H"},
         /* 100-109 */
-        { TUNER_ABSENT,        "Philips FMD1216ME"},
+        { TUNER_PHILIPS_FMD1216ME_MK3, "Philips FMD1216ME"},
         { TUNER_TEA5767,       "Philips TEA5768HL FM Radio"},
         { TUNER_ABSENT,        "Panasonic ENV57H12D5"},
         { TUNER_PHILIPS_FM1236_MK3, "TCL MFNM05-4"},