From: Nageswari Srinivasan <nageswari@ti.com>
Date: Sat, 19 Dec 2009 04:21:21 +0000 (-0800)
Subject: TI DaVinci EMAC: Fix MDIO bus frequency configuration
X-Git-Tag: v2.6.33-rc2~40^2~9
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f9c4171e01f6befdf5d15346070b819d341c9c73;p=~shefty%2Frdma-dev.git

TI DaVinci EMAC: Fix MDIO bus frequency configuration

There was a typo in "if condition" checking for validity of MDIO
bus frequency passed as part of platform data. Bitwise AND was
being used instead of a Logical AND.

Tested on: DM6467 EVM

Signed-off-by: Nageswari Srinivasan <nageswari@ti.com>
Acked-by: Anant Gole <anantgole@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 8edac8915ea..34e03104c3c 100644
--- a/drivers/net/davinci_emac.c
+++ b/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;