diff --git a/[refs] b/[refs]
index 679fb2af2d8b..f2ba1be32bbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6db5bfe7fd6d4334a1460923ba8175f1a0ece2d
+refs/heads/master: 472af2b05bdefcaee7e754e22cbf131110017ad6
diff --git a/trunk/drivers/media/video/videobuf2-dma-contig.c b/trunk/drivers/media/video/videobuf2-dma-contig.c
index 90495b7b4ddf..58205d596138 100644
--- a/trunk/drivers/media/video/videobuf2-dma-contig.c
+++ b/trunk/drivers/media/video/videobuf2-dma-contig.c
@@ -78,7 +78,7 @@ static void *vb2_dma_contig_cookie(void *buf_priv)
 {
 	struct vb2_dc_buf *buf = buf_priv;
 
-	return (void *)buf->paddr;
+	return &buf->paddr;
 }
 
 static void *vb2_dma_contig_vaddr(void *buf_priv)
diff --git a/trunk/include/media/videobuf2-dma-contig.h b/trunk/include/media/videobuf2-dma-contig.h
index 1d6188d00efd..7e6c68b23773 100644
--- a/trunk/include/media/videobuf2-dma-contig.h
+++ b/trunk/include/media/videobuf2-dma-contig.h
@@ -14,11 +14,14 @@
 #define _MEDIA_VIDEOBUF2_DMA_COHERENT_H
 
 #include <media/videobuf2-core.h>
+#include <linux/dma-mapping.h>
 
-static inline unsigned long vb2_dma_contig_plane_paddr(
-		struct vb2_buffer *vb, unsigned int plane_no)
+static inline dma_addr_t
+vb2_dma_contig_plane_paddr(struct vb2_buffer *vb, unsigned int plane_no)
 {
-	return (unsigned long)vb2_plane_cookie(vb, plane_no);
+	dma_addr_t *paddr = vb2_plane_cookie(vb, plane_no);
+
+	return *paddr;
 }
 
 void *vb2_dma_contig_init_ctx(struct device *dev);