diff options
| author | David S. Miller <davem@davemloft.net> | 2019-09-02 20:20:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-02 20:20:17 +0200 |
| commit | 765b7590c92d849806e9a27ab3a5a17cfc6a47a9 (patch) | |
| tree | 4387f5034f870accfd2bb56997c535159da45f06 /drivers/net/ethernet/amd | |
| parent | Merge branch 'net-dsa-mv88e6xxx-centralize-SERDES-IRQ-handling' (diff) | |
| parent | Linux 5.3-rc7 (diff) | |
| download | linux-765b7590c92d849806e9a27ab3a5a17cfc6a47a9.tar.xz linux-765b7590c92d849806e9a27ab3a5a17cfc6a47a9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
r8152 conflicts are the NAPI fixes in 'net' overlapping with
some tasklet stuff in net-next
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd')
| -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) |