From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date: Wed, 6 Jan 2010 23:07:16 +0000 (+0000)
Subject: stmmac: do not call fix_mac_speed if NULL
X-Git-Tag: v2.6.34-rc1~233^2~634
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=65818fa744e70a58d230083dda1f1cd8e5c5e2ee;p=~shefty%2Frdma-dev.git

stmmac: do not call fix_mac_speed if NULL

On some platforms, fix_mac_speed is used for
configuring some sysconf registers according
to the working speed.
This patch fixes the fix_mac_speed invocation
that cannot be done if it is a NULL pointer.

Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index a02006d57a5..82ebbc0c883 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -258,8 +258,9 @@ static void stmmac_adjust_link(struct net_device *dev)
 				} else {
 					ctrl &= ~priv->mac_type->hw.link.port;
 				}
-				priv->fix_mac_speed(priv->bsp_priv,
-						    phydev->speed);
+				if (likely(priv->fix_mac_speed))
+					priv->fix_mac_speed(priv->bsp_priv,
+							    phydev->speed);
 				break;
 			default:
 				if (netif_msg_link(priv))