Skip to content

Commit 607a7a4

Browse files
michichkuba-moo
authored andcommitted
octeon_ep: cancel ctrl_mbox_task after intr_poll_task
intr_poll_task may queue ctrl_mbox_task. The function octep_poll_non_ioq_interrupts_cn93_pf does this. When removing the driver and canceling these two works, cancel ctrl_mbox_task last to guarantee it does not run anymore. Fixes: 24d4333 ("octeon_ep: poll for control messages") Signed-off-by: Michal Schmidt <mschmidt@redhat.com> Link: https://lore.kernel.org/r/20230810150114.107765-4-mschmidt@redhat.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 28458c8 commit 607a7a4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/ethernet/marvell/octeon_ep/octep_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1200,14 +1200,14 @@ static void octep_remove(struct pci_dev *pdev)
12001200
if (!oct)
12011201
return;
12021202

1203-
cancel_work_sync(&oct->ctrl_mbox_task);
12041203
netdev = oct->netdev;
12051204
if (netdev->reg_state == NETREG_REGISTERED)
12061205
unregister_netdev(netdev);
12071206

12081207
cancel_work_sync(&oct->tx_timeout_task);
12091208
oct->poll_non_ioq_intr = false;
12101209
cancel_delayed_work_sync(&oct->intr_poll_task);
1210+
cancel_work_sync(&oct->ctrl_mbox_task);
12111211
octep_device_cleanup(oct);
12121212
pci_release_mem_regions(pdev);
12131213
free_netdev(netdev);

0 commit comments

Comments
 (0)