diff options
| author |   Fabio Estevam <fabio.estevam@freescale.com> | 2013-05-27 03:48:31 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-05-27 22:29:54 -0700 |
| commit | f6a4d607b3fdfaf305f3e78837cb8969d62c249a (patch) | |
| tree | 6f708a993241c6a63cbaeeef0da427e10d4ef938 /drivers/net/ethernet/freescale/fec_main.c | |
| parent | fec: Invert the order of error path sequence (diff) | |
| download | linux-dev-f6a4d607b3fdfaf305f3e78837cb8969d62c249a.tar.xz linux-dev-f6a4d607b3fdfaf305f3e78837cb8969d62c249a.zip | |
fec: Disable the PHY regulator on error and removal
In the case of error during probe, disable the PHY regulator.
Do the same in fec_drv_remove().
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/fec_main.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index dc7388ed40e7..58ac0c76441f 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1926,6 +1926,8 @@ fec_probe(struct platform_device *pdev) "Failed to enable phy regulator: %d\n", ret); goto failed_regulator; } + } else { + fep->reg_phy = NULL; } fec_reset_phy(pdev); @@ -1982,6 +1984,8 @@ failed_irq: free_irq(irq, ndev); } failed_init: + if (fep->reg_phy) + regulator_disable(fep->reg_phy); failed_regulator: clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ipg); @@ -2005,6 +2009,8 @@ fec_drv_remove(struct platform_device *pdev) unregister_netdev(ndev); fec_enet_mii_remove(fep); del_timer_sync(&fep->time_keep); + if (fep->reg_phy) + regulator_disable(fep->reg_phy); clk_disable_unprepare(fep->clk_ptp); if (fep->ptp_clock) ptp_clock_unregister(fep->ptp_clock); |