From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Sun, 5 May 2013 12:03:40 +0000 (+0800)
Subject: KVM: add missing misc_deregister() on error in kvm_init()
X-Git-Tag: firefly_0821_release~3680^2~36^2~16^2^2~286
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5cb100b38a7bf5bc5e892fa46998ebcbab925f37;p=firefly-linux-kernel-4.4.55.git

KVM: add missing misc_deregister() on error in kvm_init()

Add the missing misc_deregister() before return from kvm_init()
in the debugfs init error handling case.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
(cherry picked from commit afc2f792cdcb67f4257f0e68d10ee4a7b7eae57a)
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 302681c4aa44..b547a1ceecbc 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3181,6 +3181,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
 
 out_undebugfs:
 	unregister_syscore_ops(&kvm_syscore_ops);
+	misc_deregister(&kvm_dev);
 out_unreg:
 	kvm_async_pf_deinit();
 out_free: