From 108b88694f6bd673146cdbdefb317733767d3e31 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 8 Feb 2010 17:03:51 +0800 Subject: [PATCH] --- yaml --- r: 186057 b: refs/heads/master c: d225f53b76f4287365efd381b9e3a732e6bad27e h: refs/heads/master i: 186055: 8f1f13780426770f82401adeb2724fbc440d2c2c v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/i8254.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 88cb9761ccc4..1fe5a6c15a69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a19a6d1131c77822ae55f84a1bd6d62327e99287 +refs/heads/master: d225f53b76f4287365efd381b9e3a732e6bad27e diff --git a/trunk/arch/x86/kvm/i8254.c b/trunk/arch/x86/kvm/i8254.c index 6a74246f80c6..c9569f20dfba 100644 --- a/trunk/arch/x86/kvm/i8254.c +++ b/trunk/arch/x86/kvm/i8254.c @@ -663,8 +663,9 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm, u32 flags) kvm_io_bus_unregister_dev(kvm, KVM_PIO_BUS, &pit->dev); fail: - if (pit->irq_source_id >= 0) - kvm_free_irq_source_id(kvm, pit->irq_source_id); + kvm_unregister_irq_mask_notifier(kvm, 0, &pit->mask_notifier); + kvm_unregister_irq_ack_notifier(kvm, &pit_state->irq_ack_notifier); + kvm_free_irq_source_id(kvm, pit->irq_source_id); kfree(pit); return NULL;