Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 464 → Rev 463

/shark/trunk/drivers/bttv/bttv-if.c
245,8 → 245,6
return I2C_FUNC_SMBUS_EMUL;
}
 
extern unsigned long read_time(void);
 
static int
bttv_i2c_wait_done(struct bttv *btv)
{
253,12 → 251,12
u32 stat;
unsigned long timeout;
 
timeout = read_time() + 10000; /* 10ms */
timeout = jiffies + HZ/100 + 1; /* 10ms */
for (;;) {
stat = btread(BT848_INT_STAT);
if (stat & BT848_INT_I2CDONE)
break;
if (timeout > read_time())
if (time_after(jiffies,timeout))
return -EIO;
udelay(10);
}