---

yaml --- r: 92565 b: refs/heads/master c: 87a1738 h: refs/heads/master i: 92563: 3e6329f v: v3
git-mirror · Apr 24, 2008 · 2cbec10 · 2cbec10
1 parent 83f292c
commit 2cbec10
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d04203c7f49a4d93304b5754de5457297fa04eb
+refs/heads/master: 87a1738919ef028d16c462437e1480fc67338cd3
diff --git a/trunk/drivers/media/video/cx88/cx88-core.c b/trunk/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/trunk/drivers/media/video/cx88/cx88-video.c b/trunk/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,