lkml.org 
[lkml]   [2022]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 092/158] net: systemport: Fix an error handling path in bcm_sysport_probe()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit ef6b1cd11962aec21c58d137006ab122dbc8d6fd ]

    if devm_clk_get_optional() fails, we still need to go through the error
    handling path.

    Add the missing goto.

    Fixes: 6328a126896ea ("net: systemport: Manage Wake-on-LAN clock")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Acked-by: Florian Fainelli <f.fainelli@gmail.com>
    Link: https://lore.kernel.org/r/99d70634a81c229885ae9e4ee69b2035749f7edc.1652634040.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Paolo Abeni <pabeni@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/broadcom/bcmsysport.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
    index 60dde29974bf..df51be3cbe06 100644
    --- a/drivers/net/ethernet/broadcom/bcmsysport.c
    +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
    @@ -2585,8 +2585,10 @@ static int bcm_sysport_probe(struct platform_device *pdev)
    device_set_wakeup_capable(&pdev->dev, 1);

    priv->wol_clk = devm_clk_get_optional(&pdev->dev, "sw_sysportwol");
    - if (IS_ERR(priv->wol_clk))
    - return PTR_ERR(priv->wol_clk);
    + if (IS_ERR(priv->wol_clk)) {
    + ret = PTR_ERR(priv->wol_clk);
    + goto err_deregister_fixed_link;
    + }

    /* Set the needed headroom once and for all */
    BUILD_BUG_ON(sizeof(struct bcm_tsb) != 8);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-05-23 20:03    [W:9.299 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site