| From 46312f49ee0eca77bdb5cd318109624d2cbd8a01 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: r6040: fix wrong logic in mdio code |
| |
| From: Joe Chou <Joe.Chou@rdc.com.tw> |
| |
| [ Upstream commit: 11e5e8f5d14a1229706576184d2cf4c4556ed94c ] |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/net/r6040.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/net/r6040.c |
| +++ b/drivers/net/r6040.c |
| @@ -214,7 +214,7 @@ static int r6040_phy_read(void __iomem * |
| /* 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 |
| /* Wait for the write bit to be cleared */ |
| while (limit--) { |
| cmd = ioread16(ioaddr + MMDIO); |
| - if (cmd & MDIO_WRITE) |
| + if (!(cmd & MDIO_WRITE)) |
| break; |
| } |
| } |
