aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Chou <Joe.Chou@rdc.com.tw>2008-12-22 22:38:17 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-22 22:38:17 -0500
commit11e5e8f5d14a1229706576184d2cf4c4556ed94c (patch)
tree192f95c801dccf0455985c0011c20af47d59f226
parent5f2f6da76c429c42d54f73807f00b8fd761a7d68 (diff)
r6040: fix wrong logic in mdio code
This patch fixes a reverse logic in the MDIO code. Signed-off-by: Joe Chou <Joe.Chou@rdc.com.tw> Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/r6040.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 281080d579e1..cc5e316de571 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -214,7 +214,7 @@ static int r6040_phy_read(void __iomem *ioaddr, int phy_addr, int reg)
214 /* Wait for the read bit to be cleared */ 214 /* Wait for the read bit to be cleared */
215 while (limit--) { 215 while (limit--) {
216 cmd = ioread16(ioaddr + MMDIO); 216 cmd = ioread16(ioaddr + MMDIO);
217 if (cmd & MDIO_READ) 217 if (!(cmd & MDIO_READ))
218 break; 218 break;
219 } 219 }
220 220
@@ -233,7 +233,7 @@ static void r6040_phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val
233 /* Wait for the write bit to be cleared */ 233 /* Wait for the write bit to be cleared */
234 while (limit--) { 234 while (limit--) {
235 cmd = ioread16(ioaddr + MMDIO); 235 cmd = ioread16(ioaddr + MMDIO);
236 if (cmd & MDIO_WRITE) 236 if (!(cmd & MDIO_WRITE))
237 break; 237 break;
238 } 238 }
239} 239}