diff options
| author | Andy Duan <fugang.duan@nxp.com> | 2019-05-23 01:55:28 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-04 08:02:31 +0200 |
| commit | 4294c3475035b5f06f878bebadbeb3bf6d63b962 (patch) | |
| tree | 3f278d83bd6db7c40db01370fbad4832dea24fa4 | |
| parent | 566dc17b993d53c73b8930d5b2b55102a16a5956 (diff) | |
| download | linux-4294c3475035b5f06f878bebadbeb3bf6d63b962.tar.gz linux-4294c3475035b5f06f878bebadbeb3bf6d63b962.tar.bz2 linux-4294c3475035b5f06f878bebadbeb3bf6d63b962.zip | |
net: fec: fix the clk mismatch in failed_reset path
[ Upstream commit ce8d24f9a5965a58c588f9342689702a1024433c ]
Fix the clk mismatch in the error path "failed_reset" because
below error path will disable clk_ahb and clk_ipg directly, it
should use pm_runtime_put_noidle() instead of pm_runtime_put()
to avoid to call runtime resume callback.
Reported-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
Tested-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index ad41ace0a27a..bf715a367273 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3571,7 +3571,7 @@ failed_init: if (fep->reg_phy) regulator_disable(fep->reg_phy); failed_reset: - pm_runtime_put(&pdev->dev); + pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); failed_regulator: clk_disable_unprepare(fep->clk_ahb); |