From b932fcddda62426bd41017b6a49c17981192a56c Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Mon, 28 Feb 2011 06:37:02 -0300
Subject: [PATCH] --- yaml --- r: 242103 b: refs/heads/master c:
 35d9f510b67b10338161aba6229d4f55b4000f5b h: refs/heads/master i:   242101:
 0a608a83dbe80ec2c24d2dbf457aa4e69e62810b   242099:
 49e37e06c8fb39a58e268c3a828bcb8654204003   242095:
 7e90c6bfd29c862d51f1bbd6dcbc8f33b9fb504b v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/videobuf-dma-contig.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index baf9e4990bf5..e01e4609001d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4093a5c4a3f59cba1a085bbf87b6ffdddc5a443d
+refs/heads/master: 35d9f510b67b10338161aba6229d4f55b4000f5b
diff --git a/trunk/drivers/media/video/videobuf-dma-contig.c b/trunk/drivers/media/video/videobuf-dma-contig.c
index c9691115f2d2..c4742fc15529 100644
--- a/trunk/drivers/media/video/videobuf-dma-contig.c
+++ b/trunk/drivers/media/video/videobuf-dma-contig.c
@@ -300,7 +300,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
 
 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 	retval = remap_pfn_range(vma, vma->vm_start,
-				 mem->dma_handle >> PAGE_SHIFT,
+				 PFN_DOWN(virt_to_phys(mem->vaddr)),
 				 size, vma->vm_page_prot);
 	if (retval) {
 		dev_err(q->dev, "mmap: remap failed with error %d. ", retval);