diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
| commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
| tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /drivers/net/smsc911x.c | |
| parent | d18921a0e319ab512f8186b1b1142c7b8634c779 (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/smsc911x.c')
| -rw-r--r-- | drivers/net/smsc911x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 6e175e5555a1..dceae8a65809 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
| @@ -1619,7 +1619,7 @@ static int smsc911x_eeprom_send_cmd(struct smsc911x_data *pdata, u32 op) | |||
| 1619 | do { | 1619 | do { |
| 1620 | msleep(1); | 1620 | msleep(1); |
| 1621 | e2cmd = smsc911x_reg_read(pdata, E2P_CMD); | 1621 | e2cmd = smsc911x_reg_read(pdata, E2P_CMD); |
| 1622 | } while ((e2cmd & E2P_CMD_EPC_BUSY_) && (timeout--)); | 1622 | } while ((e2cmd & E2P_CMD_EPC_BUSY_) && (--timeout)); |
| 1623 | 1623 | ||
| 1624 | if (!timeout) { | 1624 | if (!timeout) { |
| 1625 | SMSC_TRACE(DRV, "TIMED OUT"); | 1625 | SMSC_TRACE(DRV, "TIMED OUT"); |