diff options
| author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2010-01-06 23:07:16 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-07 17:06:08 -0800 |
| commit | 65818fa744e70a58d230083dda1f1cd8e5c5e2ee (patch) | |
| tree | 931659e1a0b2abda76c0829f6ab826b524cebbd0 /drivers/net/stmmac | |
| parent | ca5f12c1a82cf72ce73617dfc8ef56faf6fec30a (diff) | |
| download | op-kernel-dev-65818fa744e70a58d230083dda1f1cd8e5c5e2ee.zip op-kernel-dev-65818fa744e70a58d230083dda1f1cd8e5c5e2ee.tar.gz | |
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>
Diffstat (limited to 'drivers/net/stmmac')
| -rw-r--r-- | drivers/net/stmmac/stmmac_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index a02006d..82ebbc0 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)) |
