aboutsummaryrefslogtreecommitdiffstats
path: root/virt/kvm
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2022-06-07 12:06:02 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2022-06-07 12:06:02 -0400
commita280e358465b4ac8982dc1eb2deebcb020443b7f (patch)
tree2e8ea05740008b6b2761e30069aefabb1710ca2d /virt/kvm
parentLinux 5.19-rc1 (diff)
parentKVM: SVM: fix tsc scaling cache logic (diff)
downloadlinux-dev-a280e358465b4ac8982dc1eb2deebcb020443b7f.tar.xz
linux-dev-a280e358465b4ac8982dc1eb2deebcb020443b7f.zip
Merge branch 'kvm-5.19-early-fixes' into HEAD
Diffstat (limited to 'virt/kvm')
-rw-r--r--virt/kvm/kvm_main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 64ec2222a196..44c47670447a 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -4300,8 +4300,11 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
kvm_put_kvm_no_destroy(kvm);
mutex_lock(&kvm->lock);
list_del(&dev->vm_node);
+ if (ops->release)
+ ops->release(dev);
mutex_unlock(&kvm->lock);
- ops->destroy(dev);
+ if (ops->destroy)
+ ops->destroy(dev);
return ret;
}