diff --git a/[refs] b/[refs]
index 6e1550d650ba..16f59c09a0f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba5d1012292403c8037adf4a54c4ec50dfe846c4
+refs/heads/master: f0a70c882ea546bbd802643990ceded32c39facc
diff --git a/trunk/drivers/xen/gntdev.c b/trunk/drivers/xen/gntdev.c
index a2ea5335e152..aba76d437ea8 100644
--- a/trunk/drivers/xen/gntdev.c
+++ b/trunk/drivers/xen/gntdev.c
@@ -575,21 +575,26 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
 	if (!(vma->vm_flags & VM_WRITE))
 		map->flags |= GNTMAP_readonly;
 
+	spin_unlock(&priv->lock);
+
 	err = apply_to_page_range(vma->vm_mm, vma->vm_start,
 				  vma->vm_end - vma->vm_start,
 				  find_grant_ptes, map);
 	if (err) {
 		printk(KERN_WARNING "find_grant_ptes() failure.\n");
-		goto unlock_out;
+		return err;
 	}
 
 	err = map_grant_pages(map);
 	if (err) {
 		printk(KERN_WARNING "map_grant_pages() failure.\n");
-		goto unlock_out;
+		return err;
 	}
+
 	map->is_mapped = 1;
 
+	return 0;
+
 unlock_out:
 	spin_unlock(&priv->lock);
 	return err;