Commit d67cab52 authored by Johan Hovold's avatar Johan Hovold Committed by Kleber Sacilotto de Souza

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

BugLink: https://bugs.launchpad.net/bugs/1878232

commit 2d222656 upstream.

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

Fixes: 27ffefd2 ("stmmac: dwmac-rk: create a new probe function")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarIan May <ian.may@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 950c9391
...@@ -600,7 +600,16 @@ static int rk_gmac_probe(struct platform_device *pdev) ...@@ -600,7 +600,16 @@ static int rk_gmac_probe(struct platform_device *pdev)
if (ret) if (ret)
return 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[] = { static const struct of_device_id rk_gmac_dwmac_match[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment