summaryrefslogtreecommitdiffstats
path: root/src/drivers
diff options
context:
space:
mode:
authorHolger Lubitz2007-07-27 21:40:38 +0200
committerHolger Lubitz2007-07-27 21:40:38 +0200
commit59ad3dac4002222719caaa6363959b6712ae2364 (patch)
treeecee4b310145cb6cd93e172c0b52712310f6534d /src/drivers
parentmake __udivmoddi4 static (diff)
parentInhibit a spurious warning on GCC 4.0.1 (diff)
downloadipxe-59ad3dac4002222719caaa6363959b6712ae2364.tar.gz
ipxe-59ad3dac4002222719caaa6363959b6712ae2364.tar.xz
ipxe-59ad3dac4002222719caaa6363959b6712ae2364.zip
Merge branch 'master' into symcheck2
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/net/sis900.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c
index 68ac511be..85c4acbe5 100644
--- a/src/drivers/net/sis900.c
+++ b/src/drivers/net/sis900.c
@@ -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;