lkml.org 
[lkml]   [2019]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 61/79] amd-xgbe: Fix error path in xgbe_mod_init()
    Date
    From: YueHaibing <yuehaibing@huawei.com>

    [ Upstream commit b6b4dc4c1fa7f1c99398e7dc85758049645e9588 ]

    In xgbe_mod_init(), we should do cleanup if some error occurs

    Reported-by: Hulk Robot <hulkci@huawei.com>
    Fixes: efbaa828330a ("amd-xgbe: Add support to handle device renaming")
    Fixes: 47f164deab22 ("amd-xgbe: Add PCI device support")
    Signed-off-by: YueHaibing <yuehaibing@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/amd/xgbe/xgbe-main.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
    index b41f23679a087..7ce9c69e9c44f 100644
    --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
    +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
    @@ -469,13 +469,19 @@ static int __init xgbe_mod_init(void)

    ret = xgbe_platform_init();
    if (ret)
    - return ret;
    + goto err_platform_init;

    ret = xgbe_pci_init();
    if (ret)
    - return ret;
    + goto err_pci_init;

    return 0;
    +
    +err_pci_init:
    + xgbe_platform_exit();
    +err_platform_init:
    + unregister_netdevice_notifier(&xgbe_netdev_notifier);
    + return ret;
    }

    static void __exit xgbe_mod_exit(void)
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-09-20 00:32    [W:3.326 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site