Commit 586f1aeb authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: fix stmmac_xdp_open() clk_ptp_ref error cleanup 



Neither stmmac_xdp_release() nor the normal paths of stmmac_xdp_open()
touch clk_ptp_ref, so stmmac_xdp_open() should not be doing anything
with this clock. However, in its error path, it calls
stmmac_hw_teardown() which disables and unprepares this clock, which
can lead to the clock state becoming unbalanced when the netdev is
taken administratively down.

Remove this call to stmmac_hw_teardown(), and as this is the last user
of this function, remove the function as well.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 454bbe59

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+0 −8
Original line number Diff line number Diff line
@@ -3568,13 +3568,6 @@ static int stmmac_hw_setup(struct net_device *dev, bool ptp_register) 
	return 0;

}



static void stmmac_hw_teardown(struct net_device *dev)

{

	struct stmmac_priv *priv = netdev_priv(dev);



	clk_disable_unprepare(priv->plat->clk_ptp_ref);

}



static void stmmac_free_irq(struct net_device *dev,

			    enum request_irq_err irq_err, int irq_idx)

{
@@ -6992,7 +6985,6 @@ int stmmac_xdp_open(struct net_device *dev) 
	for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)

		hrtimer_cancel(&priv->dma_conf.tx_queue[chan].txtimer);



	stmmac_hw_teardown(dev);

init_error:

	free_dma_desc_resources(priv, &priv->dma_conf);

dma_desc_error: