lkml.org 
[lkml]   [2020]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 075/107] net: fec: correct the error path for regulator disable in probe
    Date
    From: Fugang Duan <fugang.duan@nxp.com>

    [ Upstream commit c6165cf0dbb82ded90163dce3ac183fc7a913dc4 ]

    Correct the error path for regulator disable.

    Fixes: 9269e5560b26 ("net: fec: add phy-reset-gpios PROBE_DEFER check")
    Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/freescale/fec_main.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
    index 39c112f1543c1..a0e4b12ac4ea2 100644
    --- a/drivers/net/ethernet/freescale/fec_main.c
    +++ b/drivers/net/ethernet/freescale/fec_main.c
    @@ -3707,11 +3707,11 @@ fec_probe(struct platform_device *pdev)
    failed_irq:
    failed_init:
    fec_ptp_stop(pdev);
    - if (fep->reg_phy)
    - regulator_disable(fep->reg_phy);
    failed_reset:
    pm_runtime_put_noidle(&pdev->dev);
    pm_runtime_disable(&pdev->dev);
    + if (fep->reg_phy)
    + regulator_disable(fep->reg_phy);
    failed_regulator:
    clk_disable_unprepare(fep->clk_ahb);
    failed_clk_ahb:
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-24 10:50    [W:2.907 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site