From 10a5a80b3c69d65d66c4d9f4f796725f09bbc8cb Mon Sep 17 00:00:00 2001 From: Roel Kluin <12o3l@tiscali.nl> Date: Tue, 29 Jan 2008 21:14:56 +0100 Subject: 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 Signed-off-by: David S. Miller --- drivers/net/arm/at91_ether.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/net/arm') diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c index 25b114a4e2b..0ae0d83e5d2 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); -- cgit v1.2.3