3 files changed, 7 insertions, 6 deletions

diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c
index 40be908da238..62310122ee78 100644
--- a/virt/kvm/arm/vgic/vgic-init.c
+++ b/virt/kvm/arm/vgic/vgic-init.c
@@ -285,11 +285,9 @@ int vgic_init(struct kvm *kvm)
         if (ret)
                 goto out;
 
-        if (vgic_supports_direct_msis(kvm)) {
-                ret = vgic_v4_init(kvm);
-                if (ret)
-                        goto out;
-        }
+        ret = vgic_v4_init(kvm);
+        if (ret)
+                goto out;
 
         kvm_for_each_vcpu(i, vcpu, kvm)
                 kvm_vgic_vcpu_enable(vcpu);
diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
index b8c1b724ba3e..c93ecd4a903b 100644
--- a/virt/kvm/arm/vgic/vgic-its.c
+++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -1673,7 +1673,7 @@ static int vgic_its_create(struct kvm_device *dev, u32 type)
 
         if (vgic_initialized(dev->kvm)) {
                 int ret = vgic_v4_init(dev->kvm);
-                if (ret) {
+                if (ret < 0) {
                         kfree(its);
                         return ret;
                 }
diff --git a/virt/kvm/arm/vgic/vgic-v4.c b/virt/kvm/arm/vgic/vgic-v4.c
index 915d09dc2638..53c324aa44ef 100644
--- a/virt/kvm/arm/vgic/vgic-v4.c
+++ b/virt/kvm/arm/vgic/vgic-v4.c
@@ -118,6 +118,9 @@ int vgic_v4_init(struct kvm *kvm)
         struct kvm_vcpu *vcpu;
         int i, nr_vcpus, ret;
 
+        if (!vgic_supports_direct_msis(kvm))
+                return 0; /* Nothing to see here... move along. */
+
         if (dist->its_vm.vpes)
                 return 0;