diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-21 17:35:46 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-21 17:35:46 -0200 |
| commit | 7ea6ff7b86e3f2d2361cf99823f0aa886c526098 (patch) | |
| tree | fe87b0813697bc1a3261eda2f9773b3bed8bc35f /linux/drivers/media/video | |
| parent | 2d953c628662f68a0e645a1cbf770fcd6e52e517 (diff) | |
| parent | 9c474c59247f90df24a8952d917a277995e49ed6 (diff) | |
| download | mediapointer-dvb-s2-7ea6ff7b86e3f2d2361cf99823f0aa886c526098.tar.gz mediapointer-dvb-s2-7ea6ff7b86e3f2d2361cf99823f0aa886c526098.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-i2c.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-i2c.c b/linux/drivers/media/video/ivtv/ivtv-i2c.c index ebf85f74e..481f76903 100644 --- a/linux/drivers/media/video/ivtv/ivtv-i2c.c +++ b/linux/drivers/media/video/ivtv/ivtv-i2c.c @@ -806,6 +806,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; } |