Merge git://git.kvack.org/~bcrl/aio-next

[firefly-linux-kernel-4.4.55.git] / drivers / isdn / i4l / isdn_common.c

diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 130f216431541d2bd3259757e7765d929a91dc5a..9b856e1890d1ebc4f7c82ebb6b045357abe5324b 100644 (file)
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -2381,7 +2381,7 @@ static void __exit isdn_exit(void)
        }
        isdn_tty_exit();
        unregister_chrdev(ISDN_MAJOR, "isdn");
-       del_timer(&dev->timer);
+       del_timer_sync(&dev->timer);
        /* call vfree with interrupts enabled, else it will hang */
        vfree(dev);
        printk(KERN_NOTICE "ISDN-subsystem unloaded\n");