Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6a4d607 authored by Fabio Estevam's avatar Fabio Estevam Committed by David S. Miller
Browse files

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: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7a2bbd8d

drivers/net/ethernet/freescale/fec_main.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -1926,6 +1926,8 @@ fec_probe(struct platform_device *pdev) 
				"Failed to enable phy regulator: %d\n", ret);

				"Failed to enable phy regulator: %d\n", ret);

			goto failed_regulator;

			goto failed_regulator;

		}

		}

	} else {

		fep->reg_phy = NULL;

	}

	}





	fec_reset_phy(pdev);

	fec_reset_phy(pdev);
@@ -1982,6 +1984,8 @@ fec_probe(struct platform_device *pdev) 
			free_irq(irq, ndev);

			free_irq(irq, ndev);

	}

	}

failed_init:

failed_init:

	if (fep->reg_phy)

		regulator_disable(fep->reg_phy);

failed_regulator:

failed_regulator:

	clk_disable_unprepare(fep->clk_ahb);

	clk_disable_unprepare(fep->clk_ahb);

	clk_disable_unprepare(fep->clk_ipg);

	clk_disable_unprepare(fep->clk_ipg);
@@ -2005,6 +2009,8 @@ fec_drv_remove(struct platform_device *pdev) 
	unregister_netdev(ndev);

	unregister_netdev(ndev);

	fec_enet_mii_remove(fep);

	fec_enet_mii_remove(fep);

	del_timer_sync(&fep->time_keep);

	del_timer_sync(&fep->time_keep);

	if (fep->reg_phy)

		regulator_disable(fep->reg_phy);

	clk_disable_unprepare(fep->clk_ptp);

	clk_disable_unprepare(fep->clk_ptp);

	if (fep->ptp_clock)

	if (fep->ptp_clock)

		ptp_clock_unregister(fep->ptp_clock);

		ptp_clock_unregister(fep->ptp_clock);