From 22668e682b52c6ee2221642b4562cf924c8a3d48 Mon Sep 17 00:00:00 2001
From: Lucas Stach <dev@lynxeye.de>
Date: Mon, 12 Mar 2012 20:15:01 +0100
Subject: [PATCH] --- yaml --- r: 294815 b: refs/heads/master c:
 09c32533c064782a7989b6fecce776833bca0e12 h: refs/heads/master i:   294813:
 6114f73fcc2ec6c0878478e912d9f9b955b7769f   294811:
 1993f2c2af437198904996fd59e494f3a0c6814d   294807:
 5cc2cc77d32dee85d489c7967eb89b6007a4939c   294799:
 c2ee40bf862b29858038f823d33eb483341a27dd   294783:
 696bf246a575264ded7ac17ed10326b785236d47 v: v3

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

diff --git a/[refs] b/[refs]
index 0e11604bda1d..7a64c9b77bfb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a31f6f48bb6e37b3195fcecd69d30740f6b0036
+refs/heads/master: 09c32533c064782a7989b6fecce776833bca0e12
diff --git a/trunk/drivers/iommu/tegra-gart.c b/trunk/drivers/iommu/tegra-gart.c
index b21598fc2628..779306ee7b16 100644
--- a/trunk/drivers/iommu/tegra-gart.c
+++ b/trunk/drivers/iommu/tegra-gart.c
@@ -246,7 +246,7 @@ static int gart_iommu_map(struct iommu_domain *domain, unsigned long iova,
 	pfn = __phys_to_pfn(pa);
 	if (!pfn_valid(pfn)) {
 		dev_err(gart->dev, "Invalid page: %08x\n", pa);
-		spin_lock_irqsave(&gart->pte_lock, flags);
+		spin_unlock_irqrestore(&gart->pte_lock, flags);
 		return -EINVAL;
 	}
 	gart_set_pte(gart, iova, GART_PTE(pfn));