git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
stmmac: do not call fix_mac_speed if NULL
[pandora-kernel.git]
/
drivers
/
net
/
stmmac
/
stmmac_main.c
diff --git
a/drivers/net/stmmac/stmmac_main.c
b/drivers/net/stmmac/stmmac_main.c
index
a02006d
..
82ebbc0
100644
(file)
--- 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))