From: Roel Kluin <12o3l@tiscali.nl>
Date: Tue, 29 Jan 2008 20:14:56 +0000 (+0100)
Subject: drivers/net/arm/at91_ether.c: logical/bitand typo in function reset_phy()
X-Git-Tag: v2.6.25-rc1~1065^2~27
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=10a5a80b3c69d65d66c4d9f4f796725f09bbc8cb;p=cascardo%2Flinux.git

drivers/net/arm/at91_ether.c: logical/bitand typo in function reset_phy()

include/linux/mii.h:48:#define BMCR_RESET 0x8000

The function reset_phy() is in "#if 0" inactivated code

Replace logical "&&" by bit "&" before BMCR_RESET

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index 25b114a4e2b1..0ae0d83e5d22 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -384,7 +384,7 @@ static void reset_phy(struct net_device *dev)
 	/* Wait until PHY reset is complete */
 	do {
 		read_phy(lp->phy_address, MII_BMCR, &bmcr);
-	} while (!(bmcr && BMCR_RESET));
+	} while (!(bmcr & BMCR_RESET));
 
 	disable_mdi();
 	spin_unlock_irq(&lp->lock);