diff options
| author | Angus Clark <angus.clark@st.com> | 2011-10-26 19:43:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-27 23:17:11 -0400 |
| commit | e2c57f839c63f452b4704e048c8db9cf669ed410 (patch) | |
| tree | 8e3553d961db5fc5de5e83ba5469b0e0cbcbdfc3 /drivers/net/ethernet/stmicro | |
| parent | 5e6efe88c54ad79353666f5371b5b97c0e16111e (diff) | |
| download | linux-3.10-e2c57f839c63f452b4704e048c8db9cf669ed410.tar.gz linux-3.10-e2c57f839c63f452b4704e048c8db9cf669ed410.tar.bz2 linux-3.10-e2c57f839c63f452b4704e048c8db9cf669ed410.zip | |
stmmac: fix NULL pointer dereference in capabilities fixup (v2)
Signed-off-by: Angus Clark <angus.clark@st.com>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index fcdd5a2cbb5..003ab56f49b 100644 --- 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); - priv->phydev->advertising = priv->phydev->supported; + phydev->advertising = phydev->supported; } /* |