summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Tang <ytang5@marvell.com>2011-08-30 05:31:54 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-06 18:05:21 (GMT)
commit8607c42540d0aa61ab562506681d34c245b91fae (patch)
tree079e39f8b3316063ab6c057bb8429bb95ba086b3
parentba7fcb0c954921534707f08ebc4d8beeb2eb17e7 (diff)
downloadlinux-fsl-qoriq-8607c42540d0aa61ab562506681d34c245b91fae.tar.xz
[media] media: vb2: fix userptr VMA release seq
Align vb2 user pointer VMA release sequence with munmap. Do vm_ops->vm_close before release file. Signed-off-by: Yu Tang <ytang5@marvell.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/videobuf2-memops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/videobuf2-memops.c b/drivers/media/video/videobuf2-memops.c
index 569eeb3..71a7a78 100644
--- a/drivers/media/video/videobuf2-memops.c
+++ b/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);