diff options
| author | Fugang Duan <fugang.duan@nxp.com> | 2020-08-13 15:13:14 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-26 10:41:01 +0200 |
| commit | 1b9dee25ad258d1f20636b19724b3a4e0a22844a (patch) | |
| tree | d62ef4899cf132c136f0ae5d87b4deab49386e73 | |
| parent | c0e04d08e544ec2053c786d186c2e84bbccef83e (diff) | |
| download | linux-stable-1b9dee25ad258d1f20636b19724b3a4e0a22844a.tar.gz linux-stable-1b9dee25ad258d1f20636b19724b3a4e0a22844a.tar.bz2 linux-stable-1b9dee25ad258d1f20636b19724b3a4e0a22844a.zip | |
net: fec: correct the error path for regulator disable in probe
[ Upstream commit c6165cf0dbb82ded90163dce3ac183fc7a913dc4 ]
Correct the error path for regulator disable.
Fixes: 9269e5560b26 ("net: fec: add phy-reset-gpios PROBE_DEFER check")
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 39c112f1543c..a0e4b12ac4ea 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3707,11 +3707,11 @@ failed_mii_init: failed_irq: failed_init: fec_ptp_stop(pdev); - if (fep->reg_phy) - regulator_disable(fep->reg_phy); failed_reset: pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); + if (fep->reg_phy) + regulator_disable(fep->reg_phy); failed_regulator: clk_disable_unprepare(fep->clk_ahb); failed_clk_ahb: |