diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/cx23885/Kconfig | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-core.c | 5 | ||||
| -rw-r--r-- | linux/include/media/v4l2-i2c-drv.h | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx23885/Kconfig b/linux/drivers/media/video/cx23885/Kconfig index 3393dd615..1fd326fe4 100644 --- a/linux/drivers/media/video/cx23885/Kconfig +++ b/linux/drivers/media/video/cx23885/Kconfig @@ -15,6 +15,7 @@ config VIDEO_CX23885 select TUNER_XC2028 if !DVB_FE_CUSTOMIZE select TUNER_TDA8290 if !DVB_FE_CUSTOMIZE select DVB_TDA18271 if !DVB_FE_CUSTOMIZE + select DVB_TUNER_XC5000 if !DVB_FE_CUSTOMIZE ---help--- This is a video4linux driver for Conexant 23885 based TV cards. diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index c81e7e581..f6608f1b2 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -899,12 +899,11 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) break; if (analog_ops->set_config) { - tuner_warn("Tuner frontend module has no way to " - "set config\n"); + analog_ops->set_config(&t->fe, cfg->priv); break; } - analog_ops->set_config(&t->fe, cfg->priv); + tuner_dbg("Tuner frontend module has no way to set config\n"); break; } /* --- v4l ioctls --- */ diff --git a/linux/include/media/v4l2-i2c-drv.h b/linux/include/media/v4l2-i2c-drv.h index 09e5f8de5..8b5d74912 100644 --- a/linux/include/media/v4l2-i2c-drv.h +++ b/linux/include/media/v4l2-i2c-drv.h @@ -21,6 +21,11 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __V4L2_I2C_DRV_H__ +#define __V4L2_I2C_DRV_H__ + +#include <media/v4l2-common.h> + struct v4l2_i2c_driver_data { const char * const name; int driverid; @@ -206,3 +211,5 @@ static void __exit v4l2_i2c_drv_cleanup(void) module_init(v4l2_i2c_drv_init); module_exit(v4l2_i2c_drv_cleanup); + +#endif /* __V4L2_I2C_DRV_H__ */ |