From cb72a71738c40ef0a4dafa9d8f9971a7b47dc0b3 Mon Sep 17 00:00:00 2001
From: Daniel Walker <dwalker@fifo99.com>
Date: Mon, 5 Oct 2009 13:31:45 -0700
Subject: [PATCH] --- yaml --- r: 167020 b: refs/heads/master c:
 265489003c463f3d78d622fba60d56d16b3009dd h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/plat-omap/iovmm.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e3a969f5e7d8..61749f6e4137 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba6a117944f958a5b3fb6631b9ac7eaed3a4cb2a
+refs/heads/master: 265489003c463f3d78d622fba60d56d16b3009dd
diff --git a/trunk/arch/arm/plat-omap/iovmm.c b/trunk/arch/arm/plat-omap/iovmm.c
index 0e5573d5bb57..dc3fac3dd0ea 100644
--- a/trunk/arch/arm/plat-omap/iovmm.c
+++ b/trunk/arch/arm/plat-omap/iovmm.c
@@ -363,8 +363,9 @@ void *da_to_va(struct iommu *obj, u32 da)
 		goto out;
 	}
 	va = area->va;
-	mutex_unlock(&obj->mmap_lock);
 out:
+	mutex_unlock(&obj->mmap_lock);
+
 	return va;
 }
 EXPORT_SYMBOL_GPL(da_to_va);