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: fix NULL pointer dereference in capabilities fixup (v2)
[pandora-kernel.git]
/
drivers
/
net
/
ethernet
/
stmicro
/
stmmac
/
stmmac_main.c
diff --git
a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index
fcdd5a2
..
003ab56
100644
(file)
--- a/
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@
-325,7
+325,7
@@
static int stmmac_init_phy(struct net_device *dev)
(interface == PHY_INTERFACE_MODE_RMII))) {
phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause |
SUPPORTED_Asym_Pause);
- p
riv->phydev->advertising = priv->
phydev->supported;
+ p
hydev->advertising =
phydev->supported;
}
/*