diff options
| author | David S. Miller | 2009-02-03 09:15:35 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-02-03 09:15:35 +0100 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /drivers/net/tsi108_eth.c | |
| parent | tun: Check supplemental groups in TUN/TAP driver. (diff) | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds... (diff) | |
| download | kernel-qcow2-linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.tar.gz kernel-qcow2-linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.tar.xz kernel-qcow2-linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'drivers/net/tsi108_eth.c')
| -rw-r--r-- | drivers/net/tsi108_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c index 1138782e5611..bb43e7fb2a50 100644 --- a/drivers/net/tsi108_eth.c +++ b/drivers/net/tsi108_eth.c @@ -1237,7 +1237,7 @@ static void tsi108_init_phy(struct net_device *dev) spin_lock_irqsave(&phy_lock, flags); tsi108_write_mii(data, MII_BMCR, BMCR_RESET); - while (i--){ + while (--i) { if(!(tsi108_read_mii(data, MII_BMCR) & BMCR_RESET)) break; udelay(10); |