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

net: ethernet: stmmac: dwmac-rk: fix probe error path

Browse source 
commit 2d222656db08b8eef3b53b56cf1ce4a90fe8cd78 upstream.

Make sure to disable runtime PM, power down the PHY, and disable clocks
before returning on late probe errors.

Fixes: 27ffefd2d1 ("stmmac: dwmac-rk: create a new probe function")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2016-11-30 15:29:51 +01:00 • committed by Greg Kroah-Hartman
parent 7474448706
commit 7b7954183b
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
View file

@ -600,7 +600,16 @@ static int rk_gmac_probe(struct platform_device *pdev)
if (ret)
return ret;
return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
if (ret)
goto err_gmac_exit;
return 0;
err_gmac_exit:
rk_gmac_exit(pdev, plat_dat->bsp_priv);
return ret;
}
static const struct of_device_id rk_gmac_dwmac_match[] = {