2 files changed, 7 insertions, 3 deletions

diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index 55ad76ee2d09..9fbbdea3d1d5 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -58,12 +58,16 @@ void kvm_notify_acked_irq(struct kvm *kvm, unsigned gsi)
 void kvm_register_irq_ack_notifier(struct kvm *kvm,
                                    struct kvm_irq_ack_notifier *kian)
 {
+        /* Must be called with in-kernel IRQ chip, otherwise it's nonsense */
+        ASSERT(irqchip_in_kernel(kvm));
+        ASSERT(kian);
         hlist_add_head(&kian->link, &kvm->arch.irq_ack_notifier_list);
 }
 
-void kvm_unregister_irq_ack_notifier(struct kvm *kvm,
-                                     struct kvm_irq_ack_notifier *kian)
+void kvm_unregister_irq_ack_notifier(struct kvm_irq_ack_notifier *kian)
 {
+        if (!kian)
+                return;
         hlist_del(&kian->link);
 }
 
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index a87f45edfae8..4f43abe198e4 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -143,7 +143,7 @@ static void kvm_free_assigned_device(struct kvm *kvm,
         if (irqchip_in_kernel(kvm) && assigned_dev->irq_requested)
                 free_irq(assigned_dev->host_irq, (void *)assigned_dev);
 
-        kvm_unregister_irq_ack_notifier(kvm, &assigned_dev->ack_notifier);
+        kvm_unregister_irq_ack_notifier(&assigned_dev->ack_notifier);
         kvm_free_irq_source_id(kvm, assigned_dev->irq_source_id);
 
         if (cancel_work_sync(&assigned_dev->interrupt_work))