diff options
author | Johan Hovold <johan@kernel.org> | 2016-11-30 09:29:51 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-12-02 10:42:45 -0500 |
commit | 2d222656db08b8eef3b53b56cf1ce4a90fe8cd78 (patch) | |
tree | c7136d451969a9cdc74340661f05957bfc6b923e | |
parent | 0a9e22715ee384cf2a714c28f24ce8881b9fd815 (diff) |
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>
-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) | |||
988 | if (ret) | 988 | if (ret) |
989 | return ret; | 989 | return ret; |
990 | 990 | ||
991 | return stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); | 991 | ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); |
992 | if (ret) | ||
993 | goto err_gmac_exit; | ||
994 | |||
995 | return 0; | ||
996 | |||
997 | err_gmac_exit: | ||
998 | rk_gmac_exit(pdev, plat_dat->bsp_priv); | ||
999 | |||
1000 | return ret; | ||
992 | } | 1001 | } |
993 | 1002 | ||
994 | static const struct of_device_id rk_gmac_dwmac_match[] = { | 1003 | static const struct of_device_id rk_gmac_dwmac_match[] = { |