summaryrefslogtreecommitdiffstats
path: root/virt/kvm/kvm_main.c
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-06-09 16:38:15 -0700
committerJakub Kicinski <kuba@kernel.org>2022-06-09 16:38:15 -0700
commita98a62e456e25048e8d64ec452a1c713169d3517 (patch)
tree52bc4063aae5015ef28f174d9de409788ee9e0a4 /virt/kvm/kvm_main.c
parent263efe85a4b618037e1003c9636562d6cbb5f9f3 (diff)
parent825464e79db4aac936e0fdae62cdfb7546d0028f (diff)
downloadlinux-a98a62e456e25048e8d64ec452a1c713169d3517.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'virt/kvm/kvm_main.c')
-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;
}