---

yaml --- r: 243385 b: refs/heads/master c: a93e20a h: refs/heads/master i: 243383: 265c0df v: v3
git-mirror · Mar 24, 2011 · 162d8b5 · 162d8b5
1 parent 18a2cb6
commit 162d8b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;