diff options
| author | Johan Hovold <johan@kernel.org> | 2016-11-30 15:29:51 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-02 10:42:45 -0500 |
| commit | 2d222656db08b8eef3b53b56cf1ce4a90fe8cd78 (patch) | |
| tree | c7136d451969a9cdc74340661f05957bfc6b923e /drivers/net/ethernet/stmicro/stmmac | |
| parent | 0a9e22715ee384cf2a714c28f24ce8881b9fd815 (diff) | |
| download | blackbird-obmc-linux-2d222656db08b8eef3b53b56cf1ce4a90fe8cd78.tar.gz blackbird-obmc-linux-2d222656db08b8eef3b53b56cf1ce4a90fe8cd78.zip | |
net: ethernet: stmmac: dwmac-rk: fix probe error path
Make sure to disable runtime PM, power down the PHY, and disable clocks
before returning on late probe errors.
Fixes: 27ffefd2d109 ("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>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 3740a4417fa0..e7aabe56c15a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -988,7 +988,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[] = { |
