2 files changed, 5 insertions, 6 deletions

diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index dca9f3ae5fd..6039a8f57b4 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -929,11 +929,10 @@ int cx88_set_tvnorm(struct cx88_core *core, v4l2_std_id norm)
 
         dprintk(1,"set_tvnorm: MO_INPUT_FORMAT  0x%08x [old=0x%08x]\n",
                 cxiformat, cx_read(MO_INPUT_FORMAT) & 0x0f);
-        /* Chroma AGC must be disabled if SECAM is used */
-        if (norm & V4L2_STD_SECAM)
-                cx_andor(MO_INPUT_FORMAT, 0x40f, cxiformat);
-        else
-                cx_andor(MO_INPUT_FORMAT, 0xf, cxiformat);
+        /* Chroma AGC must be disabled if SECAM is used, we enable it
+           by default on PAL and NTSC */
+        cx_andor(MO_INPUT_FORMAT, 0x40f,
+                 norm & V4L2_STD_SECAM ? cxiformat : cxiformat | 0x400);
 
         // FIXME: as-is from DScaler
         dprintk(1,"set_tvnorm: MO_OUTPUT_FORMAT 0x%08x [old=0x%08x]\n",
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 7ec6763f0e7..f9bcb9dc858 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -233,7 +233,7 @@ static struct cx88_ctrl cx8800_ctls[] = {
                         .name          = "Chroma AGC",
                         .minimum       = 0,
                         .maximum       = 1,
-                        .default_value = 0x0,
+                        .default_value = 0x1,
                         .type          = V4L2_CTRL_TYPE_BOOLEAN,
                 },
                 .reg                   = MO_INPUT_FORMAT,