Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4613b279 authored by Peter Chen's avatar Peter Chen Committed by David S. Miller
Browse files

ethernet: stmicro: stmmac: add missing of_node_put after calling of_parse_phandle 



of_node_put needs to be called when the device node which is got
from of_parse_phandle has finished using.

This commit fixes both local (in stmmac_axi_setup) and global
(plat->phy_node) device_node for this issue, and using the
correct device node when tries to put node at stmmac_probe_config_dt
for error path.

Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7113b3a

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

+1 −0
Original line number Diff line number Diff line
@@ -3397,6 +3397,7 @@ int stmmac_dvr_remove(struct device *dev) 
	stmmac_set_mac(priv->ioaddr, false);

	netif_carrier_off(ndev);

	unregister_netdev(ndev);

	of_node_put(priv->plat->phy_node);

	if (priv->stmmac_rst)

		reset_control_assert(priv->stmmac_rst);

	clk_disable_unprepare(priv->pclk);

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

+5 −2
Original line number Diff line number Diff line
@@ -113,8 +113,10 @@ static struct stmmac_axi *stmmac_axi_setup(struct platform_device *pdev) 
		return NULL;



	axi = kzalloc(sizeof(*axi), GFP_KERNEL);

	if (!axi)

	if (!axi) {

		of_node_put(np);

		return ERR_PTR(-ENOMEM);

	}



	axi->axi_lpi_en = of_property_read_bool(np, "snps,lpi_en");

	axi->axi_xit_frm = of_property_read_bool(np, "snps,xit_frm");
@@ -127,6 +129,7 @@ static struct stmmac_axi *stmmac_axi_setup(struct platform_device *pdev) 
	of_property_read_u32(np, "snps,wr_osr_lmt", &axi->axi_wr_osr_lmt);

	of_property_read_u32(np, "snps,rd_osr_lmt", &axi->axi_rd_osr_lmt);

	of_property_read_u32_array(np, "snps,blen", axi->axi_blen, AXI_BLEN);

	of_node_put(np);



	return axi;

}
@@ -302,7 +305,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) 
		dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg),

				       GFP_KERNEL);

		if (!dma_cfg) {

			of_node_put(np);

			of_node_put(plat->phy_node);

			return ERR_PTR(-ENOMEM);

		}

		plat->dma_cfg = dma_cfg;