Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 179537
b: refs/heads/master
c: 2818591
h: refs/heads/master
i:
  179535: 7aaae75
v: v3
  • Loading branch information
Manu Abraham authored and Mauro Carvalho Chehab committed Jan 17, 2010
1 parent 2352706 commit 658806a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 68fe255cd15cf1fe04877fbbb0eafe80c43eff5d
refs/heads/master: 281859179f731b28aae78d13b2e8720219492000
5 changes: 0 additions & 5 deletions trunk/drivers/media/dvb/mantis/mantis_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ static int mantis_i2c_read(struct mantis_pci *mantis, const struct i2c_msg *msg)

/* wait for xfer completion */
for (trials = 0; trials < TRIALS; trials++) {
msleep(1);
stat = mmread(MANTIS_INT_STAT);
if (stat & MANTIS_INT_I2CDONE)
break;
Expand All @@ -71,7 +70,6 @@ static int mantis_i2c_read(struct mantis_pci *mantis, const struct i2c_msg *msg)
stat = mmread(MANTIS_INT_STAT);
if (stat & MANTIS_INT_I2CRACK)
break;
msleep(1);
}

dprintk(MANTIS_TMG, 0, "I2CRACK: trials=%d\n", trials);
Expand Down Expand Up @@ -108,7 +106,6 @@ static int mantis_i2c_write(struct mantis_pci *mantis, const struct i2c_msg *msg

/* wait for xfer completion */
for (trials = 0; trials < TRIALS; trials++) {
msleep(1);
stat = mmread(MANTIS_INT_STAT);
if (stat & MANTIS_INT_I2CDONE)
break;
Expand All @@ -121,7 +118,6 @@ static int mantis_i2c_write(struct mantis_pci *mantis, const struct i2c_msg *msg
stat = mmread(MANTIS_INT_STAT);
if (stat & MANTIS_INT_I2CRACK)
break;
msleep(1);
}

dprintk(MANTIS_TMG, 0, "I2CRACK: trials=%d\n", trials);
Expand Down Expand Up @@ -164,7 +160,6 @@ static int mantis_i2c_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, in
mmwrite(txd, MANTIS_I2CDATA_CTL);
/* wait for xfer completion */
for (trials = 0; trials < TRIALS; trials++) {
msleep(1);
stat = mmread(MANTIS_INT_STAT);
if (stat & MANTIS_INT_I2CDONE)
break;
Expand Down

0 comments on commit 658806a

Please sign in to comment.