diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-12-06 14:38:49 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2022-12-06 14:38:49 -0800 |
| commit | 303520c9c53b0a8b9bf1dfb2eabb0b22bb27bb22 (patch) | |
| tree | 3207d12b999d18b3ce23326012cd6f2069681f68 | |
| parent | 70ea2c01d1e37e1496e9eee8d4a55c02a353528b (diff) | |
| parent | 9d1586def90dcfcbe732f25d7c328c897cabd813 (diff) | |
Merge "net: stmmac: fix a null pointer dereference" into wip-er12
| -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 2853022e5e38b..9413fee83b911 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3181,7 +3181,7 @@ static void stmmac_mtl_configuration(struct stmmac_priv *priv) static void stmmac_safety_feat_configuration(struct stmmac_priv *priv) { - if (priv->dma_cap.asp) { + if (priv->dma_cap.asp && priv->plat->safety_feat_cfg) { netdev_info(priv->dev, "Enabling Safety Features\n"); stmmac_safety_feat_config(priv, priv->ioaddr, priv->dma_cap.asp, priv->plat->safety_feat_cfg); |