From 162d8b5e859e6cea6fec67c411eddd4f0c6ee8c1 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 19 Mar 2011 08:45:43 +0300
Subject: [PATCH] --- yaml --- r: 243385 b: refs/heads/master c:
 a93e20a83077f57638f8574b1c072ce6712e95ec h: refs/heads/master i:   243383:
 265c0dfcf6dbb89a67a4b0cbae52ac8c794a5dcf v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/xen/gntdev.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 849d747a087d..682dc50fba92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12f0258d5b44b3b5a9442ec461bbac1f7edab8c6
+refs/heads/master: a93e20a83077f57638f8574b1c072ce6712e95ec
diff --git a/trunk/drivers/xen/gntdev.c b/trunk/drivers/xen/gntdev.c
index 00b3accc43ee..b0f9e8fb0052 100644
--- a/trunk/drivers/xen/gntdev.c
+++ b/trunk/drivers/xen/gntdev.c
@@ -662,7 +662,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
 	if (map->flags) {
 		if ((vma->vm_flags & VM_WRITE) &&
 				(map->flags & GNTMAP_readonly))
-			return -EINVAL;
+			goto out_unlock_put;
 	} else {
 		map->flags = GNTMAP_host_map;
 		if (!(vma->vm_flags & VM_WRITE))
@@ -700,6 +700,8 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
 	spin_unlock(&priv->lock);
 	return err;
 
+out_unlock_put:
+	spin_unlock(&priv->lock);
 out_put_map:
 	if (use_ptemod)
 		map->vma = NULL;