---

yaml --- r: 6595 b: refs/heads/master c: fc10c39 h: refs/heads/master i: 6593: 272a7c9 6591: 06b61a0 v: v3
git-mirror · Jul 30, 2005 · 1a8657d · 1a8657d
1 parent 3b2da07
commit 1a8657d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ede109bbe93d5bbe4271e346106847fbfea95a1
+refs/heads/master: fc10c39d7920b1db9ad2d80fa845896e529355dc
diff --git a/trunk/drivers/net/sis190.c b/trunk/drivers/net/sis190.c
@@ -383,6 +383,12 @@ static int __mdio_read(struct net_device *dev, int phy_id, int reg)
 	return mdio_read(tp->mmio_addr, phy_id, reg);
 }
 
+static u16 mdio_read_latched(void __iomem *ioaddr, int phy_id, int reg)
+{
+	mdio_read(ioaddr, phy_id, reg);
+	return mdio_read(ioaddr, phy_id, reg);
+}
+
 static u16 __devinit sis190_read_eeprom(void __iomem *ioaddr, u32 reg)
 {
 	u16 data = 0xffff;
@@ -881,7 +887,8 @@ static void sis190_phy_task(void * data)
 	if (val & BMCR_RESET) {
 		// FIXME: needlessly high ?  -- FR 02/07/2005
 		mod_timer(&tp->timer, jiffies + HZ/10);
-	} else if (!(mdio_read(ioaddr, phy_id, MII_BMSR) & BMSR_ANEGCOMPLETE)) {
+	} else if (!(mdio_read_latched(ioaddr, phy_id, MII_BMSR) &
+		     BMSR_ANEGCOMPLETE)) {
 		net_link(tp, KERN_WARNING "%s: PHY reset until link up.\n",
 			 dev->name);
 		mdio_write(ioaddr, phy_id, MII_BMCR, val | BMCR_RESET);