From c0f6972c243c687b80f000c22345687838957501 Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Tue, 29 Jan 2008 21:14:56 +0100
Subject: [PATCH] --- yaml --- r: 82673 b: refs/heads/master c:
 10a5a80b3c69d65d66c4d9f4f796725f09bbc8cb h: refs/heads/master i:   82671:
 87e2b4ebfe72e1a6fca1ceca3b2cfb64b9829947 v: v3

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

diff --git a/[refs] b/[refs]
index 2fa72dfaf933..a4ba269427a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b9b09436b8720621e5594ce25fd25f34d5d42be
+refs/heads/master: 10a5a80b3c69d65d66c4d9f4f796725f09bbc8cb
diff --git a/trunk/drivers/net/arm/at91_ether.c b/trunk/drivers/net/arm/at91_ether.c
index 25b114a4e2b1..0ae0d83e5d22 100644
--- a/trunk/drivers/net/arm/at91_ether.c
+++ b/trunk/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);