diff options
| author |   Fabio Estevam <fabio.estevam@freescale.com> | 2013-07-21 13:25:00 -0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-07-22 16:50:31 -0700 |
| commit | d265cf48ea0a5cf6d201abb0bfab6674019126d4 (patch) | |
| tree | 1cac3a245cdd6262f24f9074b79854c1b7207120 /drivers/net/ethernet/freescale | |
| parent | fec: Do not enable/disable optional clocks unconditionally (diff) | |
| download | linux-dev-d265cf48ea0a5cf6d201abb0bfab6674019126d4.tar.xz linux-dev-d265cf48ea0a5cf6d201abb0bfab6674019126d4.zip | |
fec: Fix the order for enabling/disabling the clocks
On fec_probe the clocks are enabled in the following order:
clk_ahb -> clk_ipg -> clk_enet_out -> clk_ptp
, so in the error and remove paths we should disabled them in the opposite
order.
Also fix the order in the suspend/resume functions.
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')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index beaa5762e041..5c34fd834d03 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -2179,12 +2179,12 @@ 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); - if (fep->clk_enet_out) - clk_disable_unprepare(fep->clk_enet_out); if (fep->clk_ptp) clk_disable_unprepare(fep->clk_ptp); + if (fep->clk_enet_out) + clk_disable_unprepare(fep->clk_enet_out); + clk_disable_unprepare(fep->clk_ipg); + clk_disable_unprepare(fep->clk_ahb); failed_clk: failed_ioremap: free_netdev(ndev); @@ -2216,8 +2216,8 @@ fec_drv_remove(struct platform_device *pdev) ptp_clock_unregister(fep->ptp_clock); if (fep->clk_enet_out) clk_disable_unprepare(fep->clk_enet_out); - clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ipg); + clk_disable_unprepare(fep->clk_ahb); free_netdev(ndev); return 0; @@ -2236,8 +2236,8 @@ fec_suspend(struct device *dev) } if (fep->clk_enet_out) clk_disable_unprepare(fep->clk_enet_out); - clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ipg); + clk_disable_unprepare(fep->clk_ahb); if (fep->reg_phy) regulator_disable(fep->reg_phy); @@ -2258,10 +2258,10 @@ fec_resume(struct device *dev) return ret; } - if (fep->clk_enet_out) - clk_prepare_enable(fep->clk_enet_out); clk_prepare_enable(fep->clk_ahb); clk_prepare_enable(fep->clk_ipg); + if (fep->clk_enet_out) + clk_prepare_enable(fep->clk_enet_out); if (netif_running(ndev)) { fec_restart(ndev, fep->full_duplex); netif_device_attach(ndev); |