renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00
Code

[media] zd1301: fix building interface driver without demodulator

Browse Source 
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: 47d65372b3 ("[media] zd1301_demod: ZyDAS ZD1301 DVB-T demodulator driver")
Fixes: 992b39872b ("[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>
This commit is contained in:
Arnd Bergmann 2017-02-07 11:01:41 -02:00 committed by Mauro Carvalho Chehab
parent 9165ba166c
commit 0d1270df83
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/media/dvb-frontends/zd1301_demod.h
View File

@ -34,6 +34,7 @@ struct zd1301_demod_platform_data {
int (*reg_write)(void *, u16, u8); int (*reg_write)(void *, u16, u8);
}; };
#if IS_REACHABLE(CONFIG_DVB_ZD1301_DEMOD)
/** /**
* zd1301_demod_get_dvb_frontend() - Get pointer to DVB frontend * zd1301_demod_get_dvb_frontend() - Get pointer to DVB frontend
* @pdev: Pointer to platform device * @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 *); 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 */ #endif /* ZD1301_DEMOD_H */

4
drivers/media/usb/dvb-usb-v2/zd1301.c
View File

@ -168,6 +168,10 @@ static int zd1301_frontend_attach(struct dvb_usb_adapter *adap)
adapter = zd1301_demod_get_i2c_adapter(pdev); adapter = zd1301_demod_get_i2c_adapter(pdev);
frontend = zd1301_demod_get_dvb_frontend(pdev); frontend = zd1301_demod_get_dvb_frontend(pdev);
if (!adapter || !frontend) {
ret = -ENODEV;
goto err_module_put_demod;
}
/* Add I2C tuner */ /* Add I2C tuner */
dev->mt2060_pdata.i2c_write_max = 9; dev->mt2060_pdata.i2c_write_max = 9;