V4L/DVB (6999): ivtv: stick to udelay=10 after all

Using an udelay of 5 seems to result in problems for several people.
For now abandon the udelay value of 5 and stick to 10, even though this
will mean a longer load time of the cx2584x firmware.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 10d6faf8ccdac57fbfc6033d029afed22df1771e..6d2dd8764f814c3ae85fc5b96d45bdc080379335 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -1076,10 +1076,6 @@ 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;
        }