queue-5.1/net-fec-fix-the-clk-mismatch-in-failed_reset-path.patch

   1 From foo@baz Fri 31 May 2019 03:16:39 PM PDT
   2 From: Andy Duan <fugang.duan@nxp.com>
   3 Date: Thu, 23 May 2019 01:55:28 +0000
   4 Subject: net: fec: fix the clk mismatch in failed_reset path
   5
   6 From: Andy Duan <fugang.duan@nxp.com>
   7
   8 [ Upstream commit ce8d24f9a5965a58c588f9342689702a1024433c ]
   9
  10 Fix the clk mismatch in the error path "failed_reset" because
  11 below error path will disable clk_ahb and clk_ipg directly, it
  12 should use pm_runtime_put_noidle() instead of pm_runtime_put()
  13 to avoid to call runtime resume callback.
  14
  15 Reported-by: Baruch Siach <baruch@tkos.co.il>
  16 Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
  17 Tested-by: Baruch Siach <baruch@tkos.co.il>
  18 Signed-off-by: David S. Miller <davem@davemloft.net>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20 ---
  21  drivers/net/ethernet/freescale/fec_main.c |    2 +-
  22  1 file changed, 1 insertion(+), 1 deletion(-)
  23
  24 --- a/drivers/net/ethernet/freescale/fec_main.c
  25 +++ b/drivers/net/ethernet/freescale/fec_main.c
  26 @@ -3556,7 +3556,7 @@ failed_init:
  27         if (fep->reg_phy)
  28                 regulator_disable(fep->reg_phy);
  29  failed_reset:
  30 -       pm_runtime_put(&pdev->dev);
  31 +       pm_runtime_put_noidle(&pdev->dev);
  32         pm_runtime_disable(&pdev->dev);
  33  failed_regulator:
  34         clk_disable_unprepare(fep->clk_ahb);