Merge android-4.4.180 (71cb827) into msm-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / kernel / irq / manage.c

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 36a13b7..d0193c0 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -334,11 +334,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 (!notify && old_notify)
+       if (old_notify) {
                cancel_work_sync(&old_notify->work);
-
-       if (old_notify)
                kref_put(&old_notify->kref, old_notify->release);
+       }
 
        return 0;
 }