diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 11:15:35 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 11:15:35 +0300 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /drivers/net/sungem.c | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
| download | linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.tar.xz | |
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/sungem.c')
| -rw-r--r-- | drivers/net/sungem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 4942059109f3..fc1e7f1d024b 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -148,7 +148,7 @@ static u16 __phy_read(struct gem *gp, int phy_addr, int reg) cmd |= (MIF_FRAME_TAMSB); writel(cmd, gp->regs + MIF_FRAME); - while (limit--) { + while (--limit) { cmd = readl(gp->regs + MIF_FRAME); if (cmd & MIF_FRAME_TALSB) break; |