diff options
| author | Linus Walleij <[email protected]> | 2021-11-27 00:54:16 +0100 |
|---|---|---|
| committer | Linus Walleij <[email protected]> | 2021-11-27 00:54:16 +0100 |
| commit | 2448eab44034d9603c97ca17760a53d4d6e4b60c (patch) | |
| tree | 7f323cea55258e94e0c7c70b63d02c9effb00c1f /drivers/net/amt.c | |
| parent | deee705a1c9cce9c7eb699d529f1c0b3c80d339d (diff) | |
| parent | 136057256686de39cc3a07c2e39ef6bc43003ff6 (diff) | |
Merge tag 'v5.16-rc2' into devel
Linux 5.16-rc2 is needed because nonurgent fixes headed
for next are strongly textually dependent on a fix that
was applied for rc2.
Signed-off-by: Linus Walleij <[email protected]>
Diffstat (limited to 'drivers/net/amt.c')
| -rw-r--r-- | drivers/net/amt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/amt.c b/drivers/net/amt.c index 47a04c330885..b732ee9a50ef 100644 --- a/drivers/net/amt.c +++ b/drivers/net/amt.c @@ -3286,7 +3286,7 @@ static void __exit amt_fini(void) { rtnl_link_unregister(&amt_link_ops); unregister_netdevice_notifier(&amt_notifier_block); - cancel_delayed_work(&source_gc_wq); + cancel_delayed_work_sync(&source_gc_wq); __amt_source_gc_work(); destroy_workqueue(amt_wq); } |