diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-28 00:32:41 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-28 00:32:41 -0200 |
| commit | f2f3421c456e70d7e97826073459bf00b78a9847 (patch) | |
| tree | 04e42587ea8010521440faf109ce53e93f016432 /linux/drivers/media/video/ivtv/ivtv-i2c.c | |
| parent | 040488857bec11048bf6486b2fa04e5e1b0315d0 (diff) | |
| parent | 0a4d76c92d1a6dc610b0c4bb02d16bd3847d9d8f (diff) | |
| download | mediapointer-dvb-s2-f2f3421c456e70d7e97826073459bf00b78a9847.tar.gz mediapointer-dvb-s2-f2f3421c456e70d7e97826073459bf00b78a9847.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/cx23885
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-i2c.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-i2c.c b/linux/drivers/media/video/ivtv/ivtv-i2c.c index e84ed02b5..1f421a574 100644 --- a/linux/drivers/media/video/ivtv/ivtv-i2c.c +++ b/linux/drivers/media/video/ivtv/ivtv-i2c.c @@ -604,7 +604,7 @@ static int ivtv_getsda_old(void *data) /* template for i2c-bit-algo */ static struct i2c_adapter ivtv_i2c_adap_template = { .name = "ivtv i2c driver", - .id = I2C_HW_B_CX2341X, /* algo-bit is OR'd with this */ + .id = I2C_HW_B_CX2341X, .algo = NULL, /* set by i2c-algo-bit */ .algo_data = NULL, /* filled from template */ .client_register = attach_inform, @@ -622,7 +622,7 @@ static const struct i2c_algo_bit_data ivtv_i2c_algo_template = { .setscl = ivtv_setscl_old, .getsda = ivtv_getsda_old, .getscl = ivtv_getscl_old, - .udelay = 5, + .udelay = 10, .timeout = 200, }; @@ -806,9 +806,6 @@ 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; |