From patchwork Thu May 21 09:29:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jemma Denson X-Patchwork-Id: 6453631 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 23FE09F1C1 for ; Thu, 21 May 2015 09:29:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 525AE20382 for ; Thu, 21 May 2015 09:29:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5BBAF20426 for ; Thu, 21 May 2015 09:29:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753162AbbEUJ3t (ORCPT ); Thu, 21 May 2015 05:29:49 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:36415 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753413AbbEUJ3o (ORCPT ); Thu, 21 May 2015 05:29:44 -0400 Received: by wgbgq6 with SMTP id gq6so79316786wgb.3 for ; Thu, 21 May 2015 02:29:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=+5reDdoTuKy3c2/vyWSyTPxJhm6VKz7v4OgzDmEI/4A=; b=iF57X3nCi6WTipiBSrdiWkdSfqhaYV/KEiAZYOUFH9jbTO59Hpy3Ps8UYh5pZvzHBL ub3P6MH+kQ1WGkj2SV12bClJGlhXZOggChq5EymKXS3w+cM44Vb8DwN3ddU/RoyLzH/m uLD3O2ndUln60uWBcg5FAbb/mdPpe4cPxwAGj4tPqf637iU6OX6SGcGVy/WNYsrhOf8N gZQN2+RQA3TvVitoYIJX50bH2pTyEpUfTL6C3Y/5N1O8d4Wb5MJ9dkDxj4ar0rCT8Eof WfOn5aGhY7Bh2UhZLSwYC7kjKcsfsQdDTFBnNCPDlR5benyDercs0F/qiw/9r9D265fV jSJQ== X-Received: by 10.194.203.138 with SMTP id kq10mr3575674wjc.124.1432200583052; Thu, 21 May 2015 02:29:43 -0700 (PDT) Received: from myth.denson.org.uk ([84.92.43.36]) by mx.google.com with ESMTPSA id j12sm31155365wjn.48.2015.05.21.02.29.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 May 2015 02:29:42 -0700 (PDT) From: Jemma Denson To: linux-media@vger.kernel.org Cc: mchehab@osg.samsung.com, patrick.boettcher@posteo.de, Jemma Denson Subject: [PATCH] b2c2: Mismatch in config ifdefs for SkystarS2 Date: Thu, 21 May 2015 10:29:23 +0100 Message-Id: <1432200563-3281-1-git-send-email-jdenson@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Compilation warning issued by kbuild test robot: >> drivers/media/common/b2c2/flexcop-fe-tuner.c:31:12: warning: 'flexcop_fe_request_firmware' defined but not used [-Wunused-function] static int flexcop_fe_request_firmware(struct dvb_frontend *fe, This patch fixes a mismatch in Kconfig define checks. One had a check for just CX24120, the other is checking for both CX24120 and ISL6421. Signed-off-by: Jemma Denson --- drivers/media/common/b2c2/flexcop-fe-tuner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/common/b2c2/flexcop-fe-tuner.c b/drivers/media/common/b2c2/flexcop-fe-tuner.c index 2426062..a8d562f 100644 --- a/drivers/media/common/b2c2/flexcop-fe-tuner.c +++ b/drivers/media/common/b2c2/flexcop-fe-tuner.c @@ -27,7 +27,7 @@ #define FE_SUPPORTED(fe) (defined(CONFIG_DVB_##fe) || \ (defined(CONFIG_DVB_##fe##_MODULE) && defined(MODULE))) -#if FE_SUPPORTED(BCM3510) || FE_SUPPORTED(CX24120) +#if FE_SUPPORTED(BCM3510) || (FE_SUPPORTED(CX24120) && FE_SUPPORTED(ISL6421)) static int flexcop_fe_request_firmware(struct dvb_frontend *fe, const struct firmware **fw, char *name) {