evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net: ethernet: arc: Fix a potential memory leak if an optional regulator is deferred

Browse source 
[ Upstream commit 00777fac28ba3e126b9e63e789a613e8bd2cab25 ]

If the optional regulator is deferred, we must release some resources.
They will be re-allocated when the probe function will be called again.

Fixes: 6eacf31139 ("ethernet: arc: Add support for Rockchip SoC layer device tree bindings")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christophe JAILLET 2018-03-18 23:59:36 +01:00 • committed by Greg Kroah-Hartman
parent bdb1a295ee
commit 527f39d8cd
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/ethernet/arc/emac_rockchip.c
View file

@ -150,8 +150,10 @@ static int emac_rockchip_probe(struct platform_device *pdev)
/* Optional regulator for PHY */ /* Optional regulator for PHY */
priv->regulator = devm_regulator_get_optional(dev, "phy"); priv->regulator = devm_regulator_get_optional(dev, "phy");
if (IS_ERR(priv->regulator)) { if (IS_ERR(priv->regulator)) {
if (PTR_ERR(priv->regulator) == -EPROBE_DEFER) if (PTR_ERR(priv->regulator) == -EPROBE_DEFER) {
return -EPROBE_DEFER; err = -EPROBE_DEFER;
goto out_clk_disable;
}
dev_err(dev, "no regulator found\n"); dev_err(dev, "no regulator found\n");
priv->regulator = NULL; priv->regulator = NULL;
} }