From 70682c2522a21fed1be307d2bee10e927df5a2c4 Mon Sep 17 00:00:00 2001 From: "istvan_v@mailbox.hu" Date: Sun, 31 Jul 2011 06:53:29 -0300 Subject: [PATCH] --- yaml --- r: 271677 b: refs/heads/master c: 84b271488dcd2499e9d2c7cfa2abacfd4c5cd744 h: refs/heads/master i: 271675: 8739d4d480eced5e436cad7784fecc5019c97b43 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-core.c | 3 --- trunk/drivers/media/video/cx88/cx88-video.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c90bb0785dd9..c220ebd228e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b50763a0b082e1fc40cca2a9b8936abf6e2437e +refs/heads/master: 84b271488dcd2499e9d2c7cfa2abacfd4c5cd744 diff --git a/trunk/drivers/media/video/cx88/cx88-core.c b/trunk/drivers/media/video/cx88/cx88-core.c index fbcaa1c5b09d..fbfdd8067937 100644 --- a/trunk/drivers/media/video/cx88/cx88-core.c +++ b/trunk/drivers/media/video/cx88/cx88-core.c @@ -636,9 +636,6 @@ int cx88_reset(struct cx88_core *core) cx_write(MO_PCI_INTSTAT, 0xFFFFFFFF); // Clear PCI int cx_write(MO_INT1_STAT, 0xFFFFFFFF); // Clear RISC int - /* set default notch filter */ - cx_andor(MO_HTOTAL, 0x1800, (HLNotchFilter4xFsc << 11)); - /* Reset on-board parts */ cx_write(MO_SRST_IO, 0); msleep(10); diff --git a/trunk/drivers/media/video/cx88/cx88-video.c b/trunk/drivers/media/video/cx88/cx88-video.c index 60d28fdd7791..921c56d115d6 100644 --- a/trunk/drivers/media/video/cx88/cx88-video.c +++ b/trunk/drivers/media/video/cx88/cx88-video.c @@ -266,7 +266,7 @@ static const struct cx88_ctrl cx8800_ctls[] = { .id = V4L2_CID_BAND_STOP_FILTER, .name = "Notch filter", .minimum = 0, - .maximum = 3, + .maximum = 1, .step = 1, .default_value = 0x0, .type = V4L2_CTRL_TYPE_INTEGER,