From cfb1ebe523a493c2d0d6459b5e6addb4b5211ed7 Mon Sep 17 00:00:00 2001 From: Oliver Endriss Date: Fri, 27 Oct 2006 18:02:01 -0300 Subject: [PATCH] --- yaml --- r: 40768 b: refs/heads/master c: 9bb6e2593ad4cb94944f547154baee64b4734598 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/common/saa7146_i2c.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 47460fbbbfc4..d7f1c3fef233 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 588f98312c7fd1d86290583189d2eb24da70f752 +refs/heads/master: 9bb6e2593ad4cb94944f547154baee64b4734598 diff --git a/trunk/drivers/media/common/saa7146_i2c.c b/trunk/drivers/media/common/saa7146_i2c.c index d9953f7a8b6b..5297a365c928 100644 --- a/trunk/drivers/media/common/saa7146_i2c.c +++ b/trunk/drivers/media/common/saa7146_i2c.c @@ -217,11 +217,9 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d } /* wait until we get a transfer done or error */ timeout = jiffies + HZ/100 + 1; /* 10ms */ + /* first read usually delivers bogus results... */ + saa7146_i2c_status(dev); while(1) { - /** - * first read usually delivers bogus results... - */ - saa7146_i2c_status(dev); status = saa7146_i2c_status(dev); if ((status & 0x3) != 1) break; @@ -232,10 +230,10 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d DEB_I2C(("saa7146_i2c_writeout: timed out waiting for end of xfer\n")); return -EIO; } - if ((++trial < 20) && short_delay) + if (++trial < 50 && short_delay) udelay(10); else - msleep(1); + msleep(1); } }