From 5e77840f8cc32847b631d25ad2f769d0e0a99ead Mon Sep 17 00:00:00 2001
From: Joe Chou <Joe.Chou@rdc.com.tw>
Date: Mon, 22 Dec 2008 19:38:17 -0800
Subject: [PATCH] --- yaml --- r: 122846 b: refs/heads/master c:
 11e5e8f5d14a1229706576184d2cf4c4556ed94c h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r6040.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index de560cd3e7e5..802f5f6dffb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f2f6da76c429c42d54f73807f00b8fd761a7d68
+refs/heads/master: 11e5e8f5d14a1229706576184d2cf4c4556ed94c
diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c
index 281080d579e1..cc5e316de571 100644
--- a/trunk/drivers/net/r6040.c
+++ b/trunk/drivers/net/r6040.c
@@ -214,7 +214,7 @@ static int r6040_phy_read(void __iomem *ioaddr, int phy_addr, int reg)
 	/* Wait for the read bit to be cleared */
 	while (limit--) {
 		cmd = ioread16(ioaddr + MMDIO);
-		if (cmd & MDIO_READ)
+		if (!(cmd & MDIO_READ))
 			break;
 	}
 
@@ -233,7 +233,7 @@ static void r6040_phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val
 	/* Wait for the write bit to be cleared */
 	while (limit--) {
 		cmd = ioread16(ioaddr + MMDIO);
-		if (cmd & MDIO_WRITE)
+		if (!(cmd & MDIO_WRITE))
 			break;
 	}
 }