lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 196/339] stmmac: intel: Fix an error handling path in intel_eth_pci_probe()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 5e74a4b3ec1816e3bbfd715d46ae29d2508079cb ]

    When the managed API is used, there is no need to explicitly call
    pci_free_irq_vectors().

    This looks to be a left-over from the commit in the Fixes tag. Only the
    .remove() function had been updated.

    So remove this unused function call and update goto label accordingly.

    Fixes: 8accc467758e ("stmmac: intel: use managed PCI function on probe and resume")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Reviewed-by: Wong Vee Khee <vee.khee.wong@linux.intel.com>
    Link: https://lore.kernel.org/r/1ac9b6787b0db83b0095711882c55c77c8ea8da0.1654462241.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Paolo Abeni <pabeni@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
    index 0b0be0898ac5..f6d8109e7edc 100644
    --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
    +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
    @@ -1072,13 +1072,11 @@ static int intel_eth_pci_probe(struct pci_dev *pdev,

    ret = stmmac_dvr_probe(&pdev->dev, plat, &res);
    if (ret) {
    - goto err_dvr_probe;
    + goto err_alloc_irq;
    }

    return 0;

    -err_dvr_probe:
    - pci_free_irq_vectors(pdev);
    err_alloc_irq:
    clk_disable_unprepare(plat->stmmac_clk);
    clk_unregister_fixed_rate(plat->stmmac_clk);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 15:52    [W:4.174 / U:0.788 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site