| From foo@baz Fri 31 May 2019 03:21:27 PM PDT |
| From: Andy Duan <fugang.duan@nxp.com> |
| Date: Thu, 23 May 2019 01:55:28 +0000 |
| Subject: net: fec: fix the clk mismatch in failed_reset path |
| |
| From: Andy Duan <fugang.duan@nxp.com> |
| |
| [ 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> |
| --- |
| drivers/net/ethernet/freescale/fec_main.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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); |
