From c6ac4c0b20729f9dabae46792512a99c7e774473 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Mon, 14 Jun 2010 17:17:32 +0200
Subject: [PATCH] --- yaml --- r: 200454 b: refs/heads/master c:
 00dfff77e7184140dc45724c7232e99302f6bf97 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/pci/intel-iommu.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8ad155f0ce1a..80872bdc9679 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25cbff1660d3f4c059a178a1e5b851be6d70c5e8
+refs/heads/master: 00dfff77e7184140dc45724c7232e99302f6bf97
diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c
index 3bd30557ce2e..bf8fd913d064 100644
--- a/trunk/drivers/pci/intel-iommu.c
+++ b/trunk/drivers/pci/intel-iommu.c
@@ -1874,14 +1874,15 @@ static struct dmar_domain *get_domain_for_dev(struct pci_dev *pdev, int gaw)
 			}
 		}
 		if (found) {
+			spin_unlock_irqrestore(&device_domain_lock, flags);
 			free_devinfo_mem(info);
 			domain_exit(domain);
 			domain = found;
 		} else {
 			list_add(&info->link, &domain->devices);
 			list_add(&info->global, &device_domain_list);
+			spin_unlock_irqrestore(&device_domain_lock, flags);
 		}
-		spin_unlock_irqrestore(&device_domain_lock, flags);
 	}
 
 found_domain: