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 <istva...@mailbox.hu>

diff -uNr a/drivers/media/video/cx88/cx88-core.c 
b/drivers/media/video/cx88/cx88-core.c
--- a/drivers/media/video/cx88/cx88-core.c      2011-07-31 11:19:03.000000000 
+0200
+++ b/drivers/media/video/cx88/cx88-core.c      2011-07-31 11:43:14.000000000 
+0200
@@ -636,9 +636,6 @@
        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 -uNr a/drivers/media/video/cx88/cx88-video.c 
b/drivers/media/video/cx88/cx88-video.c
--- a/drivers/media/video/cx88/cx88-video.c     2011-07-31 11:19:03.000000000 
+0200
+++ b/drivers/media/video/cx88/cx88-video.c     2011-07-31 11:43:40.000000000 
+0200
@@ -266,7 +266,7 @@
                        .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,
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to