evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

V4L/DVB (6916): ivtv: udelay has to be changed *after* the eeprom was read, not before

Browse source 
The eeprom decides which Hauppauge model it is, so the decision whether to
use an udelay of 5 or 10 needs to be taken after reading the eeprom, not
before.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2008-01-07 06:46:26 -02:00 • committed by Mauro Carvalho Chehab
parent d9030f5730
commit 89dab3573a
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/video/ivtv/ivtv-driver.c
View file

@ -1076,6 +1076,10 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
ivtv_process_eeprom(itv); 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) { if (itv->std == 0) {
itv->std = V4L2_STD_NTSC_M; itv->std = V4L2_STD_NTSC_M;
} }

5
drivers/media/video/ivtv/ivtv-i2c.c
View file

@ -541,7 +541,7 @@ static const struct i2c_algo_bit_data ivtv_i2c_algo_template = {
.setscl = ivtv_setscl_old, .setscl = ivtv_setscl_old,
.getsda = ivtv_getsda_old, .getsda = ivtv_getsda_old,
.getscl = ivtv_getscl_old, .getscl = ivtv_getscl_old,
.udelay = 5, .udelay = 10,
.timeout = 200, .timeout = 200,
}; };
@ -718,9 +718,6 @@ int init_ivtv_i2c(struct ivtv *itv)
sizeof(struct i2c_adapter)); sizeof(struct i2c_adapter));
memcpy(&itv->i2c_algo, &ivtv_i2c_algo_template, memcpy(&itv->i2c_algo, &ivtv_i2c_algo_template,
sizeof(struct i2c_algo_bit_data)); 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_algo.data = itv;
itv->i2c_adap.algo_data = &itv->i2c_algo; itv->i2c_adap.algo_data = &itv->i2c_algo;
} }