diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2019-08-29 10:46:00 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-21 07:18:42 +0200 |
| commit | 27264af16969f4e8610b151ac1bb776427ebd1d0 (patch) | |
| tree | ccfa023a9b2e1a697a7bbf82b729a12bacbb352d /drivers/net/ethernet | |
| parent | 8b7bf7b1b2dd51db61da06e5fa5823df7557d45a (diff) | |
| download | linux-stable-27264af16969f4e8610b151ac1bb776427ebd1d0.tar.gz linux-stable-27264af16969f4e8610b151ac1bb776427ebd1d0.tar.bz2 linux-stable-27264af16969f4e8610b151ac1bb776427ebd1d0.zip | |
amd-xgbe: Fix error path in xgbe_mod_init()
[ 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>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-main.c | 10 |
1 files 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 b41f23679a08..7ce9c69e9c44 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) |