[media] cx88: notch filter control fixes

This patch reduces the number of available choices for the notch filter type control
so that the standard-specific filter types cannot be selected. It is now limited to
being either 0 (4xFsc, the default) or 1 (square pixel optimized).
The patch also removes the initialization of this control from cx88_reset(), since
that is already done by init_controls(), which is called by cx8800_initdev().

Signed-off-by: Istvan Varga <istvan_v@mailbox.hu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 1 insertions, 4 deletions

diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index fbcaa1c5b09d..fbfdd8067937 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/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/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 60d28fdd7791..921c56d115d6 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/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,