From 60670d7e4820ffe5b285eb189d0dd610864c81a9 Mon Sep 17 00:00:00 2001
From: Nageswari Srinivasan <nageswari@ti.com>
Date: Fri, 18 Dec 2009 20:21:21 -0800
Subject: [PATCH] --- yaml --- r: 178133 b: refs/heads/master c:
 f9c4171e01f6befdf5d15346070b819d341c9c73 h: refs/heads/master i:   178131:
 567c8fd4ac03716ad1689cf1e5399383f452285c v: v3

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

diff --git a/[refs] b/[refs]
index 971537e9e310..78544a859179 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70abc8cb90e679d8519721e2761d8366a18212a6
+refs/heads/master: f9c4171e01f6befdf5d15346070b819d341c9c73
diff --git a/trunk/drivers/net/davinci_emac.c b/trunk/drivers/net/davinci_emac.c
index 8edac8915ea8..34e03104c3c1 100644
--- a/trunk/drivers/net/davinci_emac.c
+++ b/trunk/drivers/net/davinci_emac.c
@@ -2272,7 +2272,7 @@ static int emac_mii_reset(struct mii_bus *bus)
 	unsigned int clk_div;
 	int mdio_bus_freq = emac_bus_frequency;
 
-	if (mdio_max_freq & mdio_bus_freq)
+	if (mdio_max_freq && mdio_bus_freq)
 		clk_div = ((mdio_bus_freq / mdio_max_freq) - 1);
 	else
 		clk_div = 0xFF;