summaryrefslogtreecommitdiff
path: root/drivers/net/sis190.c
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2005-07-30 13:15:01 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-07-30 18:21:00 -0400
commitfc10c39d7920b1db9ad2d80fa845896e529355dc (patch)
tree4835f69f454be1677094a95da85c65a7cdaef1fb /drivers/net/sis190.c
parent9ede109bbe93d5bbe4271e346106847fbfea95a1 (diff)
downloadlinux-3.10-fc10c39d7920b1db9ad2d80fa845896e529355dc.tar.gz
linux-3.10-fc10c39d7920b1db9ad2d80fa845896e529355dc.tar.bz2
linux-3.10-fc10c39d7920b1db9ad2d80fa845896e529355dc.zip
[PATCH] sis190: dummy read is required by the status register
Add a dummy read before accessing the status register SiS driver suggests it. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/sis190.c')
-rw-r--r--drivers/net/sis190.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index f78799c4235..392110ede7b 100644
--- a/drivers/net/sis190.c
+++ b/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);