renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-19 02:54:00 +08:00
Code

cassini/sungem: limit reaches -1, but 0 tested

Browse Source 
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>
This commit is contained in:
Roel Kluin 2009-02-02 23:19:50 -08:00 committed by David S. Miller
parent 46578a6913
commit ff01b91636
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/cassini.c
View File

@ -806,7 +806,7 @@ static int cas_reset_mii_phy(struct cas *cp)
cas_phy_write(cp, MII_BMCR, BMCR_RESET); cas_phy_write(cp, MII_BMCR, BMCR_RESET);
udelay(100); udelay(100);
while (limit--) { while (--limit) {
val = cas_phy_read(cp, MII_BMCR); val = cas_phy_read(cp, MII_BMCR);
if ((val & BMCR_RESET) == 0) if ((val & BMCR_RESET) == 0)
break; break;
@ -979,7 +979,7 @@ static void cas_phy_init(struct cas *cp)
writel(val, cp->regs + REG_PCS_MII_CTRL); writel(val, cp->regs + REG_PCS_MII_CTRL);
limit = STOP_TRIES; limit = STOP_TRIES;
while (limit-- > 0) { while (--limit > 0) {
udelay(10); udelay(10);
if ((readl(cp->regs + REG_PCS_MII_CTRL) & if ((readl(cp->regs + REG_PCS_MII_CTRL) &
PCS_MII_RESET) == 0) PCS_MII_RESET) == 0)

2
drivers/net/sungem_phy.c
View File

@ -79,7 +79,7 @@ static int reset_one_mii_phy(struct mii_phy* phy, int phy_id)
udelay(100); udelay(100);
while (limit--) { while (--limit) {
val = __phy_read(phy, phy_id, MII_BMCR); val = __phy_read(phy, phy_id, MII_BMCR);
if ((val & BMCR_RESET) == 0) if ((val & BMCR_RESET) == 0)
break; break;