projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5e6efe8
)
stmmac: fix NULL pointer dereference in capabilities fixup (v2)
author
Angus Clark
<
[email protected]
>
Wed, 26 Oct 2011 19:43:08 +0000
(19:43 +0000)
committer
David S. Miller
<
[email protected]
>
Fri, 28 Oct 2011 03:17:11 +0000
(23:17 -0400)
Signed-off-by: Angus Clark <
[email protected]
>
Acked-by: Giuseppe Cavallaro <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index fcdd5a2cbb5519a535c1b8b2d141efcf72ef3412..003ab56f49b6accac21e268cb6789c879af2f6fb 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;
}
/*