From patchwork Sun Jul 31 09:53:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "istvan_v@mailbox.hu" X-Patchwork-Id: 1023762 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6V9tCvw029807 for ; Sun, 31 Jul 2011 09:55:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751916Ab1GaJxh (ORCPT ); Sun, 31 Jul 2011 05:53:37 -0400 Received: from mail.juropnet.hu ([212.24.188.131]:42211 "EHLO mail.juropnet.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751750Ab1GaJxh (ORCPT ); Sun, 31 Jul 2011 05:53:37 -0400 Received: from [94.248.227.4] (helo=linux-mrjj.localnet) by mail.juropnet.hu with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1QnSiC-0004n4-7C for linux-media@vger.kernel.org; Sun, 31 Jul 2011 11:53:34 +0200 From: Istvan Varga To: linux-media@vger.kernel.org Subject: [PATCH] cx88: notch filter control fixes User-Agent: KMail/1.12.2 (Linux/2.6.31.5-0.1-desktop; KDE/4.3.1; x86_64; ; ) MIME-Version: 1.0 Date: Sun, 31 Jul 2011 11:53:29 +0200 Message-Id: <201107311153.29710.istvan_v@mailbox.hu> X-Host-Lookup-Failed: Reverse DNS lookup failed for 94.248.227.4 (failed) X-Spam-Score: -4.2 (----) X-Scan-Signature: ccd22413572b0e04fc151d80117dcdeb Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 31 Jul 2011 09:55:12 +0000 (UTC) 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 --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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,