From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Fainelli Subject: [PATCH 1/3] r6040: fix wrong logic in mdio code Date: Fri, 19 Dec 2008 10:56:20 +0100 Message-ID: <200812191056.21176.florian@openwrt.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: David Miller , netdev@vger.kernel.org, Joe Chou , Jeff Garzik Return-path: Received: from mu-out-0910.google.com ([209.85.134.187]:53551 "EHLO mu-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752603AbYLSKCJ (ORCPT ); Fri, 19 Dec 2008 05:02:09 -0500 Received: by mu-out-0910.google.com with SMTP id g7so402098muf.1 for ; Fri, 19 Dec 2008 02:02:07 -0800 (PST) Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-ID: Hello David, Jeff, Those patches should be applied to -stable as well. -- From: Florian Fainelli Subject: [PATCH 1/3] r6040: fix wrong logic in mdio code This patch fixes a reverse logic in the MDIO code. Signed-off-by: Joe Chou Signed-off-by: Florian Fainelli --- diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 34fe7ef..c2e8ac1 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) /* 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; } }