aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Duan <fugang.duan@nxp.com>2019-05-23 01:55:28 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-04 05:59:41 (GMT)
commit06411db92f8665e8ae8d45d3ebbf23b51c101952 (patch)
tree817b0a2d35281c351c921a97f2554c740afd8579
parentab6cee0a35f269854264846da7628799f278bf8f (diff)
downloadkernel_replicant_linux-06411db92f8665e8ae8d45d3ebbf23b51c101952.zip
kernel_replicant_linux-06411db92f8665e8ae8d45d3ebbf23b51c101952.tar.gz
kernel_replicant_linux-06411db92f8665e8ae8d45d3ebbf23b51c101952.tar.bz2
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.c2
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 a96ad20..878ccce 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3556,7 +3556,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);