From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755238AbdBGNDJ (ORCPT ); Tue, 7 Feb 2017 08:03:09 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:49562 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754201AbdBGNDG (ORCPT ); Tue, 7 Feb 2017 08:03:06 -0500 From: Arnd Bergmann To: Antti Palosaari , Mauro Carvalho Chehab Cc: Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [media] zd1301: fix building interface driver without demodulator Date: Tue, 7 Feb 2017 14:01:41 +0100 Message-Id: <20170207130202.521074-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:K0rnBSbikHPKSlMikifKji+wfAAMJc4CwfSqFIlWiVpiUQt4EcH YTgpC6LDu/wafjdX//4mrhqzzlEu+8NVVkRQn3sdpJk4/Ah+AM6zEwUXqFASZv/laHJ6/wg gNKmLKvk0jSaUNajKfDiGTr+bnb5GIBZFaX0z62Q3j+aMtNSvuSc6c3tdHiwFgvY6FqpDeZ KWLzX7Y8+TwvehGzSFmiQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:kyWe8avTKEY=:0Wq/j+LRGyVBJdcFvWICaq MJ4aS35rspivpt2l4lYu+lDMk0VB0zmsJEKb8W8fCGjQsbRJB2V9F7PuzJ88dXPpXjCBV7gnU oVtrLg1rNGrmmMUkPcuzXscH/Va/V5+1C/Fvwk7pTRWNBb7z8SRX48rmagVtF167HpErn2tpv azq2Nn39HEQyvgG89r2kqo6xAWCS77D4Ew9sJNnt7tlmNVewAjGE/vkRnopgzRNhrB2VH40PJ inQNwQdpvufu3LnMLNpH9AF1GZPWX3QWe9sxvNQg5IR6cRWFJiTmR33JAYy15uFqX2gcX+Arv P6EIXBfI/jFdxzLzD9/dxcFtk01qcnllkfeV3XAFUXjAErPjJCP/HF5Gn0yKhOrItHP3tEXM3 GaGqqzu2vj/8zgB/FKM/LHb5mSmOaW+ralaAdgBSA0FMciIiK7dAebO47p12/bqrn1VTeAmU+ M1R9RWKQ+xwcuWwIIb1xyNd+OpevNRv8P/DAmKODxj8IkyOI/Etd3cwBYjsSmAroYjQCp/IuO CaUGjzmxT/7XtYiLRU1OMWayI5WFbG6JctuMj3waFziHIKFrlRUkL78zknyKhRuLeW+Kel4Zf BXXZHtaRo+5FH0u2/UszGKug5xF0XsWxJLugOomAox4NATavPBM6k0abVk/KJVg/ZnmjwbD4r L+8uSUrM1UWankriHkynFYnkNUmGd/GjKGzOUHFe+coA8VcjoCOnuSmW41wQFB2TxEJI= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the USB driver is enabled but the demodulator is not, we get a link error: ERROR: "zd1301_demod_get_dvb_frontend" [drivers/media/usb/dvb-usb-v2/zd1301.ko] undefined! ERROR: "zd1301_demod_get_i2c_adapter" [drivers/media/usb/dvb-usb-v2/zd1301.ko] undefined! Such a configuration obviously makes no sense, but we should not fail the build. This tries to mimic what we have for other drivers by turning the build failure into a runtime failure. Alternatively we could use an unconditional 'select' or 'depends on' to enforce a sane configuration. Fixes: 47d65372b3b6 ("[media] zd1301_demod: ZyDAS ZD1301 DVB-T demodulator driver") Fixes: 992b39872b80 ("[media] zd1301: ZyDAS ZD1301 DVB USB interface driver") Signed-off-by: Arnd Bergmann --- drivers/media/dvb-frontends/zd1301_demod.h | 18 ++++++++++++++++++ drivers/media/usb/dvb-usb-v2/zd1301.c | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/drivers/media/dvb-frontends/zd1301_demod.h b/drivers/media/dvb-frontends/zd1301_demod.h index 78a3122e4942..ceb2e05e873c 100644 --- a/drivers/media/dvb-frontends/zd1301_demod.h +++ b/drivers/media/dvb-frontends/zd1301_demod.h @@ -34,6 +34,7 @@ struct zd1301_demod_platform_data { int (*reg_write)(void *, u16, u8); }; +#if IS_REACHABLE(CONFIG_DVB_ZD1301_DEMOD) /** * zd1301_demod_get_dvb_frontend() - Get pointer to DVB frontend * @pdev: Pointer to platform device @@ -52,4 +53,21 @@ struct dvb_frontend *zd1301_demod_get_dvb_frontend(struct platform_device *); struct i2c_adapter *zd1301_demod_get_i2c_adapter(struct platform_device *); +#else + +static inline struct dvb_frontend *zd1301_demod_get_dvb_frontend(struct platform_device *dev) +{ + printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); + + return NULL; +} +static inline struct i2c_adapter *zd1301_demod_get_i2c_adapter(struct platform_device *dev) +{ + printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); + + return NULL; +} + +#endif + #endif /* ZD1301_DEMOD_H */ diff --git a/drivers/media/usb/dvb-usb-v2/zd1301.c b/drivers/media/usb/dvb-usb-v2/zd1301.c index 563e50c6a327..d1eb4b7bc051 100644 --- a/drivers/media/usb/dvb-usb-v2/zd1301.c +++ b/drivers/media/usb/dvb-usb-v2/zd1301.c @@ -168,6 +168,10 @@ static int zd1301_frontend_attach(struct dvb_usb_adapter *adap) adapter = zd1301_demod_get_i2c_adapter(pdev); frontend = zd1301_demod_get_dvb_frontend(pdev); + if (!adapter || !frontend) { + ret = -ENODEV; + goto err_module_put_demod; + } /* Add I2C tuner */ dev->mt2060_pdata.i2c_write_max = 9; -- 2.9.0