15 files changed, 47 insertions, 20 deletions

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index b68918c97f66..56c6c77793d7 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -668,6 +668,12 @@ static const struct v4l2_queryctrl bttv_ctls[] = {
                 .default_value = 32768,
                 .type          = V4L2_CTRL_TYPE_INTEGER,
         },{
+                .id            = V4L2_CID_COLOR_KILLER,
+                .name          = "Color killer",
+                .minimum       = 0,
+                .maximum       = 1,
+                .type          = V4L2_CTRL_TYPE_BOOLEAN,
+        }, {
                 .id            = V4L2_CID_HUE,
                 .name          = "Hue",
                 .minimum       = 0,
@@ -1474,6 +1480,9 @@ static int bttv_g_ctrl(struct file *file, void *priv,
         case V4L2_CID_SATURATION:
                 c->value = btv->saturation;
                 break;
+        case V4L2_CID_COLOR_KILLER:
+                c->value = btv->opt_color_killer;
+                break;
 
         case V4L2_CID_AUDIO_MUTE:
         case V4L2_CID_AUDIO_VOLUME:
@@ -1526,7 +1535,6 @@ static int bttv_s_ctrl(struct file *file, void *f,
                                         struct v4l2_control *c)
 {
         int err;
-        int val;
         struct bttv_fh *fh = f;
         struct bttv *btv = fh->btv;
 
@@ -1547,6 +1555,16 @@ static int bttv_s_ctrl(struct file *file, void *f,
         case V4L2_CID_SATURATION:
                 bt848_sat(btv, c->value);
                 break;
+        case V4L2_CID_COLOR_KILLER:
+                btv->opt_color_killer = c->value;
+                if (btv->opt_color_killer) {
+                        btor(BT848_SCLOOP_CKILL, BT848_E_SCLOOP);
+                        btor(BT848_SCLOOP_CKILL, BT848_O_SCLOOP);
+                } else {
+                        btand(~BT848_SCLOOP_CKILL, BT848_E_SCLOOP);
+                        btand(~BT848_SCLOOP_CKILL, BT848_O_SCLOOP);
+                }
+                break;
         case V4L2_CID_AUDIO_MUTE:
                 audio_mute(btv, c->value);
                 /* fall through */
@@ -1564,9 +1582,13 @@ static int bttv_s_ctrl(struct file *file, void *f,
 
         case V4L2_CID_PRIVATE_CHROMA_AGC:
                 btv->opt_chroma_agc = c->value;
-                val = btv->opt_chroma_agc ? BT848_SCLOOP_CAGC : 0;
-                btwrite(val, BT848_E_SCLOOP);
-                btwrite(val, BT848_O_SCLOOP);
+                if (btv->opt_chroma_agc) {
+                        btor(BT848_SCLOOP_CAGC, BT848_E_SCLOOP);
+                        btor(BT848_SCLOOP_CAGC, BT848_O_SCLOOP);
+                } else {
+                        btand(~BT848_SCLOOP_CAGC, BT848_E_SCLOOP);
+                        btand(~BT848_SCLOOP_CAGC, BT848_O_SCLOOP);
+                }
                 break;
         case V4L2_CID_PRIVATE_COMBFILTER:
                 btv->opt_combfilter = c->value;
diff --git a/drivers/media/pci/bt8xx/bttvp.h b/drivers/media/pci/bt8xx/bttvp.h
index 70fd4f23f605..9ec0adba236c 100644
--- a/drivers/media/pci/bt8xx/bttvp.h
+++ b/drivers/media/pci/bt8xx/bttvp.h
@@ -429,6 +429,7 @@ struct bttv {
         int opt_lumafilter;
         int opt_automute;
         int opt_chroma_agc;
+        int opt_color_killer;
         int opt_adc_crush;
         int opt_vcr_hack;
         int opt_whitecrush_upper;
diff --git a/drivers/media/pci/bt8xx/dst_ca.c b/drivers/media/pci/bt8xx/dst_ca.c
index ee3884fbc9ce..7d96fab7d246 100644
--- a/drivers/media/pci/bt8xx/dst_ca.c
+++ b/drivers/media/pci/bt8xx/dst_ca.c
@@ -646,7 +646,7 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioct
                 dprintk(verbose, DST_CA_INFO, 1, " -->CA_SET_PID Success !");
         default:
                 result = -EOPNOTSUPP;
-        };
+        }
  free_mem_and_exit:
         kfree (p_ca_message);
         kfree (p_ca_slot_info);
diff --git a/drivers/media/pci/cx23885/altera-ci.c b/drivers/media/pci/cx23885/altera-ci.c
index aee7f0dacff1..495781ee4711 100644
--- a/drivers/media/pci/cx23885/altera-ci.c
+++ b/drivers/media/pci/cx23885/altera-ci.c
@@ -416,7 +416,7 @@ static void netup_read_ci_status(struct work_struct *work)
                                 DVB_CA_EN50221_POLL_CAM_READY : 0);
                 ci_dbg_print("%s: setting CI[1] status = 0x%x\n",
                                 __func__, inter->state[1]->status);
-        };
+        }
 
         if (inter->state[0] != NULL) {
                 inter->state[0]->status =
@@ -425,7 +425,7 @@ static void netup_read_ci_status(struct work_struct *work)
                                 DVB_CA_EN50221_POLL_CAM_READY : 0);
                 ci_dbg_print("%s: setting CI[0] status = 0x%x\n",
                                 __func__, inter->state[0]->status);
-        };
+        }
 }
 
 /* CI irq handler */
diff --git a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax2.c
index c9f15d6dec40..6617774a326a 100644
--- a/drivers/media/pci/cx23885/cimax2.c
+++ b/drivers/media/pci/cx23885/cimax2.c
@@ -193,7 +193,7 @@ int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot,
                                 0, &store, 1);
                 if (ret != 0)
                         return ret;
-        };
+        }
         state->current_ci_flag = flag;
 
         mutex_lock(&dev->gpio_lock);
diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 39a4a4b9ed7e..5acdf954ff6b 100644
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -542,11 +542,13 @@ struct cx23885_board cx23885_boards[] = {
                         {
                                 .type   = CX23885_VMUX_COMPOSITE1,
                                 .vmux   = CX25840_COMPOSITE8,
+                                .amux   = CX25840_AUDIO7,
                         },
                         {
                                 .type   = CX23885_VMUX_SVIDEO,
                                 .vmux   = CX25840_SVIDEO_LUMA3 |
                                                 CX25840_SVIDEO_CHROMA4,
+                                .amux   = CX25840_AUDIO7,
                         },
                         {
                                 .type   = CX23885_VMUX_COMPONENT,
@@ -554,6 +556,7 @@ struct cx23885_board cx23885_boards[] = {
                                         CX25840_VIN1_CH1 |
                                         CX25840_VIN6_CH2 |
                                         CX25840_VIN7_CH3,
+                                .amux   = CX25840_AUDIO7,
                         },
                 },
         },
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c
index 8c4a9a5f9a50..1a21926ca412 100644
--- a/drivers/media/pci/cx23885/cx23885-video.c
+++ b/drivers/media/pci/cx23885/cx23885-video.c
@@ -508,7 +508,8 @@ static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
                 (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1250) ||
                 (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255) ||
                 (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255_22111) ||
-                (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1850)) {
+                (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1850) ||
+                (dev->board == CX23885_BOARD_MYGICA_X8507)) {
                 /* Configure audio routing */
                 v4l2_subdev_call(dev->sd_cx25840, audio, s_routing,
                         INPUT(input)->amux, 0, 0);
diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
index c8c94fbf5d8d..d33fc1a23030 100644
--- a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
+++ b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
@@ -761,7 +761,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
         }
 
         /* Default if filename is empty string */
-        if (strcmp(dev->input_filename_ch2, "") == 0) {
+        if (strcmp(dev->_filename_ch2, "") == 0) {
                 if (dev->_isNTSC_ch2) {
                         dev->_filename_ch2 = (dev->_pixel_format_ch2 ==
                                 PIXEL_FRMT_411) ? "/root/vid411.yuv" :
diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream.c b/drivers/media/pci/cx25821/cx25821-video-upstream.c
index 52c13e0b6492..6759fff8eb64 100644
--- a/drivers/media/pci/cx25821/cx25821-video-upstream.c
+++ b/drivers/media/pci/cx25821/cx25821-video-upstream.c
@@ -808,7 +808,7 @@ int cx25821_vidupstream_init_ch1(struct cx25821_dev *dev, int channel_select,
         }
 
         /* Default if filename is empty string */
-        if (strcmp(dev->input_filename, "") == 0) {
+        if (strcmp(dev->_filename, "") == 0) {
                 if (dev->_isNTSC) {
                         dev->_filename =
                                 (dev->_pixel_format == PIXEL_FRMT_411) ?
diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c
index def363fb71c0..62184eb919e5 100644
--- a/drivers/media/pci/cx88/cx88-blackbird.c
+++ b/drivers/media/pci/cx88/cx88-blackbird.c
@@ -721,7 +721,7 @@ static int vidioc_g_fmt_vid_cap (struct file *file, void *priv,
 
         f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
         f->fmt.pix.bytesperline = 0;
-        f->fmt.pix.sizeimage    = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */;
+        f->fmt.pix.sizeimage    = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */
         f->fmt.pix.colorspace   = V4L2_COLORSPACE_SMPTE170M;
         f->fmt.pix.width        = dev->width;
         f->fmt.pix.height       = dev->height;
@@ -739,7 +739,7 @@ static int vidioc_try_fmt_vid_cap (struct file *file, void *priv,
 
         f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
         f->fmt.pix.bytesperline = 0;
-        f->fmt.pix.sizeimage    = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */;
+        f->fmt.pix.sizeimage    = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */
         f->fmt.pix.colorspace   = V4L2_COLORSPACE_SMPTE170M;
         dprintk(1, "VIDIOC_TRY_FMT: w: %d, h: %d, f: %d\n",
                 dev->width, dev->height, fh->mpegq.field );
@@ -755,7 +755,7 @@ static int vidioc_s_fmt_vid_cap (struct file *file, void *priv,
 
         f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
         f->fmt.pix.bytesperline = 0;
-        f->fmt.pix.sizeimage    = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */;
+        f->fmt.pix.sizeimage    = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */
         f->fmt.pix.colorspace   = V4L2_COLORSPACE_SMPTE170M;
         dev->width              = f->fmt.pix.width;
         dev->height             = f->fmt.pix.height;
diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c
index d803bba09525..666f83b2f3c0 100644
--- a/drivers/media/pci/cx88/cx88-dvb.c
+++ b/drivers/media/pci/cx88/cx88-dvb.c
@@ -896,7 +896,7 @@ static int samsung_smt_7020_set_voltage(struct dvb_frontend *fe,
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         return (i2c_transfer(&dev->core->i2c_adap, &msg, 1) == 1) ? 0 : -EIO;
 }
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
index c04fb618e10b..d154bc197356 100644
--- a/drivers/media/pci/cx88/cx88-mpeg.c
+++ b/drivers/media/pci/cx88/cx88-mpeg.c
@@ -450,7 +450,7 @@ static irqreturn_t cx8802_irq(int irq, void *dev_id)
                         cx88_core_irq(core,status);
                 if (status & PCI_INT_TSINT)
                         cx8802_mpeg_irq(dev);
-        };
+        }
         if (MAX_IRQ_LOOP == loop) {
                 dprintk( 0, "clearing mask\n" );
                 printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n",
diff --git a/drivers/media/pci/cx88/cx88-tvaudio.c b/drivers/media/pci/cx88/cx88-tvaudio.c
index 770ec05b5e9b..424fd97495dc 100644
--- a/drivers/media/pci/cx88/cx88-tvaudio.c
+++ b/drivers/media/pci/cx88/cx88-tvaudio.c
@@ -373,7 +373,7 @@ static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode)
                 set_audio_registers(core, nicam_bgdki_common);
                 set_audio_registers(core, nicam_default);
                 break;
-        };
+        }
 
         mode |= EN_DMTRX_LR | EN_DMTRX_BYPASS;
         set_audio_finish(core, mode);
@@ -639,7 +639,7 @@ static void set_audio_standard_A2(struct cx88_core *core, u32 mode)
                 dprintk("%s Warning: wrong value\n", __func__);
                 return;
                 break;
-        };
+        }
 
         mode |= EN_FMRADIO_EN_RDS | EN_DMTRX_SUMDIFF;
         set_audio_finish(core, mode);
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index a146d50d7795..05171457bf28 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -1535,7 +1535,7 @@ static irqreturn_t cx8800_irq(int irq, void *dev_id)
                         cx88_core_irq(core,status);
                 if (status & PCI_INT_VIDINT)
                         cx8800_vid_irq(dev);
-        };
+        }
         if (10 == loop) {
                 printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n",
                        core->name);
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 22f8758d047f..4a77124ee70e 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -1204,7 +1204,7 @@ int saa7134_s_ctrl_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, str
                 break;
         default:
                 /* nothing */;
-        };
+        }
         switch (c->id) {
         case V4L2_CID_BRIGHTNESS:
                 dev->ctl_bright = c->value;