Skip to content

Commit

Permalink
cassini/sungem: limit reaches -1, but 0 tested
Browse files Browse the repository at this point in the history
while (limit--)
	if (test())
		break;

if (limit <= 0)
	goto test_failed;

In the last iteration, limit is decremented after the test to 0.
If just thereafter test() succeeds and a break occurs, the goto
still occurs because limit is 0.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Roel Kluin authored and David S. Miller committed Feb 3, 2009
1 parent 46578a6 commit ff01b91
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/net/cassini.c
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ static int cas_reset_mii_phy(struct cas *cp)

cas_phy_write(cp, MII_BMCR, BMCR_RESET);
udelay(100);
while (limit--) {
while (--limit) {
val = cas_phy_read(cp, MII_BMCR);
if ((val & BMCR_RESET) == 0)
break;
Expand Down Expand Up @@ -979,7 +979,7 @@ static void cas_phy_init(struct cas *cp)
writel(val, cp->regs + REG_PCS_MII_CTRL);

limit = STOP_TRIES;
while (limit-- > 0) {
while (--limit > 0) {
udelay(10);
if ((readl(cp->regs + REG_PCS_MII_CTRL) &
PCS_MII_RESET) == 0)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/sungem_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ static int reset_one_mii_phy(struct mii_phy* phy, int phy_id)

udelay(100);

while (limit--) {
while (--limit) {
val = __phy_read(phy, phy_id, MII_BMCR);
if ((val & BMCR_RESET) == 0)
break;
Expand Down

0 comments on commit ff01b91

Please sign in to comment.