lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 085/205] phy: lantiq: vrx200-pcie: fix error return code in ltq_vrx200_pcie_phy_power_on()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    [ Upstream commit 82b5d164415549e74cfa1f9156ffd4463d0a76e2 ]

    Fix to return a negative error code from the error handling
    case instead of 0, as done elsewhere in this function.

    Fixes: e52a632195bf ("phy: lantiq: vrx200-pcie: add a driver for the Lantiq VRX200 PCIe PHY")
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
    Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c b/drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c
    index 544d64a84cc0..6e457967653e 100644
    --- a/drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c
    +++ b/drivers/phy/lantiq/phy-lantiq-vrx200-pcie.c
    @@ -323,7 +323,8 @@ static int ltq_vrx200_pcie_phy_power_on(struct phy *phy)
    goto err_disable_pdi_clk;

    /* Check if we are in "startup ready" status */
    - if (ltq_vrx200_pcie_phy_wait_for_pll(phy) != 0)
    + ret = ltq_vrx200_pcie_phy_wait_for_pll(phy);
    + if (ret)
    goto err_disable_phy_clk;

    ltq_vrx200_pcie_phy_apply_workarounds(phy);
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-16 17:51    [W:4.054 / U:1.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site