diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-02-07 11:01:41 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-02-08 11:59:39 -0200 |
| commit | 0d1270df836fe9f5cc7e8001b7372ca4fa3f00f6 (patch) | |
| tree | 3d79a2e640e89ab81e443256d2c407e78d5f5277 /drivers/media | |
| parent | 9165ba166cac5e8c9abda2012ea37cc3430c0b14 (diff) | |
| download | blackbird-obmc-linux-0d1270df836fe9f5cc7e8001b7372ca4fa3f00f6.tar.gz blackbird-obmc-linux-0d1270df836fe9f5cc7e8001b7372ca4fa3f00f6.zip | |
[media] zd1301: fix building interface driver without demodulator
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 <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/dvb-frontends/zd1301_demod.h | 18 | ||||
| -rw-r--r-- | drivers/media/usb/dvb-usb-v2/zd1301.c | 4 |
2 files changed, 22 insertions, 0 deletions
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; |
