From 969ffe2af3a8ce809398001faaca5f8319a517de Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang5@marvell.com>
Date: Tue, 30 Aug 2011 02:31:54 -0300
Subject: [PATCH] --- yaml --- r: 271768 b: refs/heads/master c:
 8607c42540d0aa61ab562506681d34c245b91fae h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/videobuf2-memops.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e28c3de105a4..cd51063e148a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba7fcb0c954921534707f08ebc4d8beeb2eb17e7
+refs/heads/master: 8607c42540d0aa61ab562506681d34c245b91fae
diff --git a/trunk/drivers/media/video/videobuf2-memops.c b/trunk/drivers/media/video/videobuf2-memops.c
index 569eeb3dfd50..71a7a78c3fc0 100644
--- a/trunk/drivers/media/video/videobuf2-memops.c
+++ b/trunk/drivers/media/video/videobuf2-memops.c
@@ -68,12 +68,12 @@ void vb2_put_vma(struct vm_area_struct *vma)
 	if (!vma)
 		return;
 
-	if (vma->vm_file)
-		fput(vma->vm_file);
-
 	if (vma->vm_ops && vma->vm_ops->close)
 		vma->vm_ops->close(vma);
 
+	if (vma->vm_file)
+		fput(vma->vm_file);
+
 	kfree(vma);
 }
 EXPORT_SYMBOL_GPL(vb2_put_vma);