Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[platform/kernel/linux-starfive.git] / drivers / atm / nicstar.c

diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index e511714..bc5a6ab 100644 (file)
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -299,7 +299,7 @@ static void __exit nicstar_cleanup(void)
 {
        XPRINTK("nicstar: nicstar_cleanup() called.\n");
 
-       del_timer(&ns_timer);
+       del_timer_sync(&ns_timer);
 
        pci_unregister_driver(&nicstar_driver);