9 files changed, 38 insertions, 30 deletions

diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index 87d5f4d8790f..eaf130e666d8 100644
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -100,8 +100,8 @@ static u8 tda10021_readreg (struct tda10021_state* state, u8 reg)
 
         ret = i2c_transfer (state->i2c, msg, 2);
         if (ret != 2)
-                printk("DVB: TDA10021(%d): %s: readreg error (ret == %i)\n",
-                                state->frontend.dvb->num, __FUNCTION__, ret);
+                printk("DVB: TDA10021: %s: readreg error (ret == %i)\n",
+                                __FUNCTION__, ret);
         return b1[0];
 }
 
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 022913da8c59..9b0406318f2d 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -543,7 +543,7 @@ static int cadet_probe(void)
 
         for(i=0;i<8;i++) {
                 io=iovals[i];
-                if(request_region(io,2, "cadet-probe")>=0) {
+                if (request_region(io, 2, "cadet-probe")) {
                         cadet_setfreq(1410);
                         if(cadet_getfreq()==1410) {
                                 release_region(io, 2);
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 190977a1e549..0881a17d5226 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -2393,12 +2393,12 @@ struct tvcard bttv_tvcards[] = {
         .tuner          = 0,
         .tuner_type     = TUNER_LG_TDVS_H062F,
         .tuner_addr     = ADDR_UNSET,
-        .video_inputs   = 2,
+        .video_inputs   = 3,
         .audio_inputs   = 1,
         .svhs           = 2,
-        .muxsel         = { 2, 3 },
+        .muxsel         = { 2, 3, 1 },
         .gpiomask       = 0x00e00007,
-        .audiomux       = { 0x00400005, 0, 0, 0, 0, 0 },
+        .audiomux       = { 0x00400005, 0, 0x00000001, 0, 0x00c00007, 0 },
         .no_msp34xx     = 1,
         .no_tda9875     = 1,
         .no_tda7432     = 1,
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index a564321db2f0..c062a017491e 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -763,21 +763,21 @@ static void set_pll(struct bttv *btv)
                 /* no PLL needed */
                 if (btv->pll.pll_current == 0)
                         return;
-                vprintk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n",
-                        btv->c.nr,btv->pll.pll_ifreq);
+                bttv_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n",
+                           btv->c.nr,btv->pll.pll_ifreq);
                 btwrite(0x00,BT848_TGCTRL);
                 btwrite(0x00,BT848_PLL_XCI);
                 btv->pll.pll_current = 0;
                 return;
         }
 
-        vprintk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr,
-                btv->pll.pll_ifreq, btv->pll.pll_ofreq);
+        bttv_printk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr,
+                   btv->pll.pll_ifreq, btv->pll.pll_ofreq);
         set_pll_freq(btv, btv->pll.pll_ifreq, btv->pll.pll_ofreq);
 
         for (i=0; i<10; i++) {
                 /*  Let other people run while the PLL stabilizes */
-                vprintk(".");
+                bttv_printk(".");
                 msleep(10);
 
                 if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) {
@@ -785,12 +785,12 @@ static void set_pll(struct bttv *btv)
                 } else {
                         btwrite(0x08,BT848_TGCTRL);
                         btv->pll.pll_current = btv->pll.pll_ofreq;
-                        vprintk(" ok\n");
+                        bttv_printk(" ok\n");
                         return;
                 }
         }
         btv->pll.pll_current = -1;
-        vprintk("failed\n");
+        bttv_printk("failed\n");
         return;
 }
 
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h
index 9b0b7ca035f8..7a312f79340a 100644
--- a/drivers/media/video/bttvp.h
+++ b/drivers/media/video/bttvp.h
@@ -221,7 +221,7 @@ extern void bttv_gpio_tracking(struct bttv *btv, char *comment);
 extern int init_bttv_i2c(struct bttv *btv);
 extern int fini_bttv_i2c(struct bttv *btv);
 
-#define vprintk  if (bttv_verbose) printk
+#define bttv_printk if (bttv_verbose) printk
 #define dprintk  if (bttv_debug >= 1) printk
 #define d2printk if (bttv_debug >= 2) printk
 
diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 8c08b7f1ad23..b7ec9bf45085 100644
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -1397,7 +1397,7 @@ static void destroy_proc_cpia_cam(struct cam_data *cam)
 
 static void proc_cpia_create(void)
 {
-        cpia_proc_root = create_proc_entry("cpia", S_IFDIR, NULL);
+        cpia_proc_root = proc_mkdir("cpia", NULL);
 
         if (cpia_proc_root)
                 cpia_proc_root->owner = THIS_MODULE;
diff --git a/drivers/media/video/rds.h b/drivers/media/video/rds.h
index 30337d0f1a87..0d30eb744e61 100644
--- a/drivers/media/video/rds.h
+++ b/drivers/media/video/rds.h
@@ -31,7 +31,7 @@
 struct rds_command {
         unsigned int  block_count;
         int           result;
-        unsigned char *buffer;
+        unsigned char __user *buffer;
         struct file   *instance;
         poll_table    *event_list;
 };
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index 1a657a70ff43..72b70eb5da1d 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -157,7 +157,7 @@ static struct i2c_client client_template;
 
 /* ---------------------------------------------------------------------- */
 
-static int block_to_user_buf(struct saa6588 *s, unsigned char *user_buf)
+static int block_to_user_buf(struct saa6588 *s, unsigned char __user *user_buf)
 {
         int i;
 
@@ -191,7 +191,7 @@ static void read_from_buf(struct saa6588 *s, struct rds_command *a)
 {
         unsigned long flags;
 
-        unsigned char *buf_ptr = a->buffer;     /* This is a user space buffer! */
+        unsigned char __user *buf_ptr = a->buffer;
         unsigned int i;
         unsigned int rd_blocks;
 
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 4437bdebe24f..137b58f2c666 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -203,7 +203,7 @@ static const unsigned short init_ntsc[] = {
         0x8c, 640,              /* Horizontal length */
         0x8d, 640,              /* Number of pixels */
         0x8f, 0xc00,            /* Disable window 2 */
-        0xf0, 0x173,            /* 13.5 MHz transport, Forced
+        0xf0, 0x73,             /* 13.5 MHz transport, Forced
                                  * mode, latch windows */
         0xf2, 0x13,             /* NTSC M, composite input */
         0xe7, 0x1e1,            /* Enable vertical standard
@@ -212,38 +212,36 @@ static const unsigned short init_ntsc[] = {
 
 static const unsigned short init_pal[] = {
         0x88, 23,               /* Window 1 vertical begin */
-        0x89, 288 + 16,         /* Vertical lines in (16 lines
+        0x89, 288,              /* Vertical lines in (16 lines
                                  * skipped by the VFE) */
-        0x8a, 288 + 16,         /* Vertical lines out (16 lines
+        0x8a, 288,              /* Vertical lines out (16 lines
                                  * skipped by the VFE) */
         0x8b, 16,               /* Horizontal begin */
         0x8c, 768,              /* Horizontal length */
         0x8d, 784,              /* Number of pixels
                                  * Must be >= Horizontal begin + Horizontal length */
         0x8f, 0xc00,            /* Disable window 2 */
-        0xf0, 0x177,            /* 13.5 MHz transport, Forced
+        0xf0, 0x77,             /* 13.5 MHz transport, Forced
                                  * mode, latch windows */
         0xf2, 0x3d1,            /* PAL B,G,H,I, composite input */
-        0xe7, 0x261,            /* PAL/SECAM set to 288 + 16 lines 
-                                 * change to 0x241 for 288 lines */
+        0xe7, 0x241,            /* PAL/SECAM set to 288 lines */
 };
 
 static const unsigned short init_secam[] = {
-        0x88, 23  - 16,         /* Window 1 vertical begin */
-        0x89, 288 + 16,         /* Vertical lines in (16 lines
+        0x88, 23,               /* Window 1 vertical begin */
+        0x89, 288,              /* Vertical lines in (16 lines
                                  * skipped by the VFE) */
-        0x8a, 288 + 16,         /* Vertical lines out (16 lines
+        0x8a, 288,              /* Vertical lines out (16 lines
                                  * skipped by the VFE) */
         0x8b, 16,               /* Horizontal begin */
         0x8c, 768,              /* Horizontal length */
         0x8d, 784,              /* Number of pixels
                                  * Must be >= Horizontal begin + Horizontal length */
         0x8f, 0xc00,            /* Disable window 2 */
-        0xf0, 0x177,            /* 13.5 MHz transport, Forced
+        0xf0, 0x77,             /* 13.5 MHz transport, Forced
                                  * mode, latch windows */
         0xf2, 0x3d5,            /* SECAM, composite input */
-        0xe7, 0x261,            /* PAL/SECAM set to 288 + 16 lines 
-                                 * change to 0x241 for 288 lines */
+        0xe7, 0x241,            /* PAL/SECAM set to 288 lines */
 };
 
 static const unsigned char init_common[] = {
@@ -410,6 +408,12 @@ vpx3220_command (struct i2c_client *client,
         case DECODER_SET_NORM:
         {
                 int *iarg = arg, data;
+                int temp_input;
+
+                /* Here we back up the input selection because it gets
+                   overwritten when we fill the registers with the
+                   choosen video norm */
+                temp_input = vpx3220_fp_read(client, 0xf2);
 
                 dprintk(1, KERN_DEBUG "%s: DECODER_SET_NORM %d\n",
                         I2C_NAME(client), *iarg);
@@ -449,6 +453,10 @@ vpx3220_command (struct i2c_client *client,
 
                 }
                 decoder->norm = *iarg;
+
+                /* And here we set the backed up video input again */
+                vpx3220_fp_write(client, 0xf2, temp_input | 0x0010);
+                udelay(10);
         }
                 break;