Commit 939b2002 authored by Johan Hovold's avatar Johan Hovold Committed by David S. Miller

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

Make sure to call any exit() callback to undo the effect of init()
before returning on late probe errors.

Fixes: cf3f047b ("stmmac: move hw init in the probe (v2)")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d222656
...@@ -53,7 +53,17 @@ static int dwmac_generic_probe(struct platform_device *pdev) ...@@ -53,7 +53,17 @@ static int dwmac_generic_probe(struct platform_device *pdev)
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_exit;
return 0;
err_exit:
if (plat_dat->exit)
plat_dat->exit(pdev, plat_dat->bsp_priv);
return ret;
} }
static const struct of_device_id dwmac_generic_match[] = { static const struct of_device_id dwmac_generic_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