From patchwork Thu Oct 3 15:52:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 175093 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp517578ill; Thu, 3 Oct 2019 09:02:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqy5C2YkJXdcxFbQXuL6H2Yr0mTnBPQhGo5wh4ej0U0yrIEXTvH00o+9ah+fvLxbCfK4Ciuw X-Received: by 2002:a50:e718:: with SMTP id a24mr10372754edn.289.1570118535982; Thu, 03 Oct 2019 09:02:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570118535; cv=none; d=google.com; s=arc-20160816; b=ZFPYIvSJF18pyqN0woNUJ4FwRyjnqthbYDPLb2o5ZdLMy+aMsyAG52p6fyZZAy3M+Y L6BUA8vK/rH4r23IA17DyTYcLEmRcRWTLrgA22ScyzWgT/+Vfkk8FtoJDXQqGZshiO8W 3ClpdFEU9i/Hqw+mrbBLMnQyZb0DmbUjFgBR5AVJYjHOAMtTf8TbdSPOWmssHNF4JaOz PavU2BwnSplnoZBS+LozECJgWawdPxHqYQtIfjD4MVnV8/ct42blag+vdrZqTrQfn9Cz 5hkI+G0IEIACQb7i+kX+vX35V+hTYPUmzOz4tGbxR/PfyBwpWa5zecG5Wf64/wwsIHbR Etsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=v9nVliLkt2Gd0bJ4/NDNhTWHru5u/WbeX36xQfYAXGg=; b=GCKBjwkgD4lO/Q7M+aJPZzCiu/V9iKKyRzkZPnFP194oBi75zPBJQjOQEylKSkrTsD 2J65IV4oALYlXXM+3NCyr/UrLYbJAdgh5laCFugTgbzaoWcsd9RoVVc9r6aWqCT7szMn PJk0UPkm6EbfXoudq65izF6AtV2OBU8Mgkw6n963Fc8KZ2lRSfHGxu3jnPGLWaoNobjO haUvucP68mlL9ShZGsvqx8neuhFIcQAqGc5rWPI0ctjExetp14/Qr4Dbct/aA5G725Wd Opn+r5dn9ubsAhnqtunlMWAPREhdQ334cMU6mmFMqD5qsuPhOK/BI3b7FFqRl7iytUjZ ZeaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AXoRIrSX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h43si1690999ede.142.2019.10.03.09.02.15; Thu, 03 Oct 2019 09:02:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AXoRIrSX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729214AbfJCQCN (ORCPT + 27 others); Thu, 3 Oct 2019 12:02:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:46930 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730052AbfJCQCK (ORCPT ); Thu, 3 Oct 2019 12:02:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D723320700; Thu, 3 Oct 2019 16:02:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118529; bh=EHhnwzjpelJVbwpMOhDMilDvfd7Exz9RYdZKlI2NOGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AXoRIrSXHj2zhPWtyNScdtGw1ELnjGgSiC3ZvU7SmRcgLu9f0Rrc9Aq4F+ZmGSe57 K8oRqNK36jiz5LbX1Cp2PVNXeqdPqY/DOSKTjFLMjhcR1Ji2Nolykqze95ML35l0tj 9GTFyp6GXZq9CMQbWTG82EA+729rC+DtISGqU31E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Sean Young , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.9 044/129] media: dib0700: fix link error for dibx000_i2c_set_speed Date: Thu, 3 Oct 2019 17:52:47 +0200 Message-Id: <20191003154337.467011642@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154318.081116689@linuxfoundation.org> References: <20191003154318.081116689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 765bb8610d305ee488b35d07e2a04ae52fb2df9c ] When CONFIG_DVB_DIB9000 is disabled, we can still compile code that now fails to link against dibx000_i2c_set_speed: drivers/media/usb/dvb-usb/dib0700_devices.o: In function `dib01x0_pmu_update.constprop.7': dib0700_devices.c:(.text.unlikely+0x1c9c): undefined reference to `dibx000_i2c_set_speed' The call sites are both through dib01x0_pmu_update(), which gets passed an 'i2c' pointer from dib9000_get_i2c_master(), which has returned NULL. Checking this pointer seems to be a good idea anyway, and it avoids the link failure in most cases. Sean Young found another case that is not fixed by that, where certain gcc versions leave an unused function in place that causes the link error, but adding an explict IS_ENABLED() check also solves this. Fixes: b7f54910ce01 ("V4L/DVB (4647): Added module for DiB0700 based devices") Signed-off-by: Arnd Bergmann Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/dvb-usb/dib0700_devices.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.20.1 diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c index 2868766893c85..c7c8fea0f1fa1 100644 --- a/drivers/media/usb/dvb-usb/dib0700_devices.c +++ b/drivers/media/usb/dvb-usb/dib0700_devices.c @@ -2438,9 +2438,13 @@ static int dib9090_tuner_attach(struct dvb_usb_adapter *adap) 8, 0x0486, }; + if (!IS_ENABLED(CONFIG_DVB_DIB9000)) + return -ENODEV; if (dvb_attach(dib0090_fw_register, adap->fe_adap[0].fe, i2c, &dib9090_dib0090_config) == NULL) return -ENODEV; i2c = dib9000_get_i2c_master(adap->fe_adap[0].fe, DIBX000_I2C_INTERFACE_GPIO_1_2, 0); + if (!i2c) + return -ENODEV; if (dib01x0_pmu_update(i2c, data_dib190, 10) != 0) return -ENODEV; dib0700_set_i2c_speed(adap->dev, 1500); @@ -2516,10 +2520,14 @@ static int nim9090md_tuner_attach(struct dvb_usb_adapter *adap) 0, 0x00ef, 8, 0x0406, }; + if (!IS_ENABLED(CONFIG_DVB_DIB9000)) + return -ENODEV; i2c = dib9000_get_tuner_interface(adap->fe_adap[0].fe); if (dvb_attach(dib0090_fw_register, adap->fe_adap[0].fe, i2c, &nim9090md_dib0090_config[0]) == NULL) return -ENODEV; i2c = dib9000_get_i2c_master(adap->fe_adap[0].fe, DIBX000_I2C_INTERFACE_GPIO_1_2, 0); + if (!i2c) + return -ENODEV; if (dib01x0_pmu_update(i2c, data_dib190, 10) < 0) return -ENODEV;