diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-25 20:18:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-25 20:18:25 -0800 |
| commit | c2f68ad3b59d7015bf6fb0037ee0b5f2331aed28 (patch) | |
| tree | 27ba17750761072a649204ae43c7965f7b08e3d7 | |
| parent | 00684418707c7a1e36ebdedc4b30fbba5d5860b1 (diff) | |
| parent | c3c4c839336767da2d0c18e8e9bab33bef64ef8d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (6876): ivtv: mspx4xx needs a longer i2c udelay
V4L/DVB (6871): Kconfig: VIDEO_CX23885 must select DVB_LGDT330X
| -rw-r--r-- | drivers/media/video/cx23885/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-i2c.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig index d8b1ccb44913..081ee6e1536f 100644 --- a/drivers/media/video/cx23885/Kconfig +++ b/drivers/media/video/cx23885/Kconfig @@ -10,6 +10,7 @@ config VIDEO_CX23885 select VIDEOBUF_DVB select DVB_TUNER_MT2131 if !DVB_FE_CUSTOMISE select DVB_S5H1409 if !DVB_FE_CUSTOMISE + select DVB_LGDT330X if !DVB_FE_CUSTOMISE select DVB_PLL if !DVB_FE_CUSTOMISE ---help--- This is a video4linux driver for Conexant 23885 based diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c index 77b27dc750b1..44678fe27a04 100644 --- a/drivers/media/video/ivtv/ivtv-i2c.c +++ b/drivers/media/video/ivtv/ivtv-i2c.c @@ -718,6 +718,9 @@ int init_ivtv_i2c(struct ivtv *itv) sizeof(struct i2c_adapter)); memcpy(&itv->i2c_algo, &ivtv_i2c_algo_template, sizeof(struct i2c_algo_bit_data)); + /* The mspx4xx chips need a longer delay for some reason */ + if (itv->hw_flags & IVTV_HW_MSP34XX) + itv->i2c_algo.udelay = 10; itv->i2c_algo.data = itv; itv->i2c_adap.algo_data = &itv->i2c_algo; } |