From: Hans Verkuil Date: Thu, 10 Jan 2008 21:33:16 +0000 (-0300) Subject: V4L/DVB (6999): ivtv: stick to udelay=10 after all X-Git-Tag: v2.6.24-rc8~40^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=745a4c9f0ba60a414224f2d5e4f0e8e25efd04e8;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index 10d6faf8ccd..6d2dd8764f8 100644 --- 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; }