Merge branch 'master' into symcheck2
authorHolger Lubitz <hal@duncan.ol.sub.de>
Fri, 27 Jul 2007 19:40:38 +0000 (21:40 +0200)
committerHolger Lubitz <hal@duncan.ol.sub.de>
Fri, 27 Jul 2007 19:40:38 +0000 (21:40 +0200)
src/drivers/net/sis900.c

index 68ac511..85c4acb 100644 (file)
@@ -872,8 +872,9 @@ sis900_read_mode(struct nic *nic __unused, int phy_addr, int *speed, int *duplex
     u16 phy_id0, phy_id1;
         
     /* STSOUT register is Latched on Transition, read operation updates it */
-    while (i++ < 2)
+    do {
         status = sis900_mdio_read(phy_addr, MII_STSOUT);
+    } while (i++ < 2);
 
     *speed = HW_SPEED_10_MBPS;
     *duplex = FDX_CAPABLE_HALF_SELECTED;