---

yaml --- r: 82673 b: refs/heads/master c: 10a5a80 h: refs/heads/master i: 82671: 87e2b4e v: v3
git-mirror · Feb 3, 2008 · c0f6972 · c0f6972
1 parent 458f1e6
commit c0f6972
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);