[patch 2.6.13-rc4 12/15] sis190: dummy read is required by the status register

[Francois Romieu]

Add a dummy read before accessing the status register

SiS driver suggests it.

Signed-off-by: Francois Romieu <[EMAIL PROTECTED]>

diff -puN drivers/net/sis190.c~sis190-110 drivers/net/sis190.c
--- a/drivers/net/sis190.c~sis190-110   2005-07-30 00:19:29.392469845 +0200
+++ b/drivers/net/sis190.c      2005-07-30 00:19:29.413466441 +0200
@@ -383,6 +383,12 @@ static int __mdio_read(struct net_device
        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);

_
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html