Commit 4294c347 authored May 23, 2019 by Andy Duan Committed by Greg Kroah-Hartman Jun 04, 2019

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>

parent 566dc17b

drivers/net/ethernet/freescale/fec_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3571,7 +3571,7 @@ fec_probe(struct platform_device *pdev)
		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);