1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 56297298d6ee..162b3236e72c 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2504,7 +2504,6 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
                 }
         }
 
-        spin_lock(&iommu->lock);
         spin_lock_irqsave(&device_domain_lock, flags);
         if (dev)
                 found = find_domain(dev);
@@ -2520,16 +2519,17 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
 
         if (found) {
                 spin_unlock_irqrestore(&device_domain_lock, flags);
-                spin_unlock(&iommu->lock);
                 free_devinfo_mem(info);
                 /* Caller must free the original domain */
                 return found;
         }
 
+        spin_lock(&iommu->lock);
         ret = domain_attach_iommu(domain, iommu);
+        spin_unlock(&iommu->lock);
+
         if (ret) {
                 spin_unlock_irqrestore(&device_domain_lock, flags);
-                spin_unlock(&iommu->lock);
                 free_devinfo_mem(info);
                 return NULL;
         }
@@ -2539,7 +2539,6 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
         if (dev)
                 dev->archdata.iommu = info;
         spin_unlock_irqrestore(&device_domain_lock, flags);
-        spin_unlock(&iommu->lock);
 
         /* PASID table is mandatory for a PCI device in scalable mode. */
         if (dev && dev_is_pci(dev) && sm_supported(iommu)) {