Merge branch 'staging/for_v3.7' into v4l_for_linus

Applied on the top of changeset 782cd9e, as some of those patches
depend on some fixes that went via -arm tree.

* staging/for_v3.7: (109 commits)
  [media] m5mols: Add missing #include <linux/sizes.h>
  [media] stk1160: Add support for S-Video input
  Revert "[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check"
  [media]  dvb: LNA implementation changes
  [media] v4l2-ioctl: fix W=1 warnings
  [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID
  [media] omap3isp: Fix compilation error in ispreg.h
  [media] rc-msi-digivox-ii: Add full scan keycodes
  [media] cx25821: testing the wrong variable
  [media] tda18271-common: hold the I2C adapter during write transfers
  [media] ds3000: add module parameter to force firmware upload
  [media] drivers/media: Remove unnecessary semicolon
  [media] winbond: remove space from driver name
  [media] iguanair: cannot send data from the stack
  [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
  [media] dvb-usb: print small buffers via %*ph
  [media] uvc: Add return code check at vb2_queue_init()
  [media] em28xx: Replace memcpy with struct assignment
  [media] bt8xx: Add video4linux control V4L2_CID_COLOR_KILLER
  [media] mem2mem_testdev: Use devm_kzalloc() in probe
  ...

3 files changed, 28 insertions, 5 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);