From 2cbec10dbb2ad1ff30dda3a44e79c6112d5231fb Mon Sep 17 00:00:00 2001 From: Frej Drejhammar Date: Sun, 23 Mar 2008 22:43:22 -0300 Subject: [PATCH] --- yaml --- r: 92565 b: refs/heads/master c: 87a1738919ef028d16c462437e1480fc67338cd3 h: refs/heads/master i: 92563: 3e6329fd6f1c9eb866b9ccf6dea462464a0b6828 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-core.c | 9 ++++----- trunk/drivers/media/video/cx88/cx88-video.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index bce1234526ba..82c9be3f7686 100644 --- 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 index dca9f3ae5fdf..6039a8f57b48 100644 --- 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 index 7ec6763f0e79..f9bcb9dc8582 100644 --- 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,