Merge tag 'sh-for-v6.5-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubit...

[linux-2.6-microblaze.git] / virt / kvm / coalesced_mmio.c

diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c
index 5ef88f5..1b90acb 100644 (file)
--- a/virt/kvm/coalesced_mmio.c
+++ b/virt/kvm/coalesced_mmio.c
@@ -186,15 +186,10 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,
                    coalesced_mmio_in_range(dev, zone->addr, zone->size)) {
                        r = kvm_io_bus_unregister_dev(kvm,
                                zone->pio ? KVM_PIO_BUS : KVM_MMIO_BUS, &dev->dev);
-
-                       kvm_iodevice_destructor(&dev->dev);
-
                        /*
                         * On failure, unregister destroys all devices on the
-                        * bus _except_ the target device, i.e. coalesced_zones
-                        * has been modified.  Bail after destroying the target
-                        * device, there's no need to restart the walk as there
-                        * aren't any zones left.
+                        * bus, including the target device. There's no need
+                        * to restart the walk as there aren't any zones left.
                         */
                        if (r)
                                break;