summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/atheros/alx/main.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-06-26 12:24:42 +0200
committerIngo Molnar <mingo@kernel.org>2020-06-26 12:24:42 +0200
commit2c92d787cc9fad57d05c96bd117782183768258a (patch)
tree51c0c567b8be2fd56073a8ce31f8ebd123a7d562 /drivers/net/ethernet/atheros/alx/main.c
parent145a773aef83181d47ebab21bb33c89233aadb1e (diff)
parent8be3a53e18e0e1a98f288f6c7f5e9da3adbe9c49 (diff)
Merge branch 'linus' into x86/entry, to resolve conflictsx86_entry_for_5.8
Conflicts: arch/x86/kernel/traps.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/atheros/alx/main.c')
-rw-r--r--drivers/net/ethernet/atheros/alx/main.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index b9b4edb913c1..9b7f1af5f574 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -1249,8 +1249,12 @@ out_disable_adv_intr:
static void __alx_stop(struct alx_priv *alx)
{
- alx_halt(alx);
alx_free_irq(alx);
+
+ cancel_work_sync(&alx->link_check_wk);
+ cancel_work_sync(&alx->reset_wk);
+
+ alx_halt(alx);
alx_free_rings(alx);
alx_free_napis(alx);
}
@@ -1855,9 +1859,6 @@ static void alx_remove(struct pci_dev *pdev)
struct alx_priv *alx = pci_get_drvdata(pdev);
struct alx_hw *hw = &alx->hw;
- cancel_work_sync(&alx->link_check_wk);
- cancel_work_sync(&alx->reset_wk);
-
/* restore permanent mac address */
alx_set_macaddr(hw, hw->perm_addr);