From ae475dfd3b7fa6b8ea60e3a8a5d08aee76f28dc4 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 7 Jan 2008 06:46:26 -0200 Subject: [PATCH] --- yaml --- r: 75283 b: refs/heads/master c: 89dab3573aa1d95fd222ee4551f964bfa4c16823 h: refs/heads/master i: 75281: 89ac488abaca0f0f5e30a7b6254b92529b32ebc3 75279: 0774cce9119e85345463a566fe7b994d51b5ca5b v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-driver.c | 4 ++++ trunk/drivers/media/video/ivtv/ivtv-i2c.c | 5 +---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e4b8bd4390f2..d6e7204a1dcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9030f573031244dcffee026cc5e7e2f96f972ce +refs/heads/master: 89dab3573aa1d95fd222ee4551f964bfa4c16823 diff --git a/trunk/drivers/media/video/ivtv/ivtv-driver.c b/trunk/drivers/media/video/ivtv/ivtv-driver.c index 6d2dd8764f81..10d6faf8ccda 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-driver.c +++ b/trunk/drivers/media/video/ivtv/ivtv-driver.c @@ -1076,6 +1076,10 @@ static int __devinit ivtv_probe(struct pci_dev *dev, ivtv_process_eeprom(itv); } + /* The mspx4xx chips need a longer delay for some reason */ + if (!(itv->hw_flags & IVTV_HW_MSP34XX)) + itv->i2c_algo.udelay = 5; + if (itv->std == 0) { itv->std = V4L2_STD_NTSC_M; } diff --git a/trunk/drivers/media/video/ivtv/ivtv-i2c.c b/trunk/drivers/media/video/ivtv/ivtv-i2c.c index 44678fe27a04..36e54f78aa2a 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-i2c.c +++ b/trunk/drivers/media/video/ivtv/ivtv-i2c.c @@ -541,7 +541,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, }; @@ -718,9 +718,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; }