1 files changed, 3 insertions, 1 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 1401afa0d58a..53a081392115 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -357,8 +357,10 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
         desc->affinity_notify = notify;
         raw_spin_unlock_irqrestore(&desc->lock, flags);
 
-        if (old_notify)
+        if (old_notify) {
+                cancel_work_sync(&old_notify->work);
                 kref_put(&old_notify->kref, old_notify->release);
+        }
 
         return 0;
 }