diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-04-20 17:05:13 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-20 17:05:13 +0300 |
| commit | 7a258ff04f9d5fe549fed6d03931a0236587047e (patch) | |
| tree | 6b164332c2a3983d972cc4dc47af3fce6cc5dc32 /virt/kvm/eventfd.c | |
| parent | 382bd4de61827dbaaf5fb4fb7b1f4be4a86505e7 (diff) | |
| parent | f61143c45077df4fa78e2f1ba455a00bbe1d5b8c (diff) | |
| download | linux-7a258ff04f9d5fe549fed6d03931a0236587047e.tar.xz | |
Merge branch 'linus' into irq/core
Pick up upstream fixes to avoid conflicts with pending patches.
Diffstat (limited to 'virt/kvm/eventfd.c')
| -rw-r--r-- | virt/kvm/eventfd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index a29786dd9522..4d28a9ddbee0 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -870,7 +870,8 @@ kvm_deassign_ioeventfd_idx(struct kvm *kvm, enum kvm_bus bus_idx, continue; kvm_io_bus_unregister_dev(kvm, bus_idx, &p->dev); - kvm->buses[bus_idx]->ioeventfd_count--; + if (kvm->buses[bus_idx]) + kvm->buses[bus_idx]->ioeventfd_count--; ioeventfd_release(p); ret = 0; break; |