[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <E1eXXig-0002B1-IA@ZenIV.linux.org.uk>
Date: Fri, 05 Jan 2018 19:31:58 +0000
From: Al Viro <viro@....linux.org.uk>
To: netdev@...r.kernel.org
Cc: <peppe.cavallaro@...com>, Cavallaro@....linux.org.uk,
Giuseppe@....linux.org.uk
Subject: Subject: [RFC][PATCH 04/11] stmmac: fix breakage in
stmmac_hw_setup()
Since "drivers: net: stmmac: reworking the PCS code" ->pcs_ctrl_ane()
had been taking iomem address to access as the first argument; its
predecessor (->ctrl_ane()) used to take struct mac_device_info instead.
One of the callers had not been converted; as the result, instead of
reading and modifying a word in card iomem we read and modify a word
in (or near) the in-core strucct mac_device_info.
Fixes: 70523e639bf8 (drivers: net: stmmac: reworking the PCS code)
Cc: stable@...r.kernel.org
Signed-off-by: Al Viro <viro@...iv.linux.org.uk>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index d9c98fd810bb..68ed903f0ac8 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2571,7 +2571,7 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
}
if (priv->hw->pcs && priv->hw->mac->pcs_ctrl_ane)
- priv->hw->mac->pcs_ctrl_ane(priv->hw, 1, priv->hw->ps, 0);
+ priv->hw->mac->pcs_ctrl_ane(priv->ioaddr, 1, priv->hw->ps, 0);
/* set TX and RX rings length */
stmmac_set_rings_length(priv);
--
2.11.0
Powered by blists - more mailing lists