From 52aad87e2d031ccc83d2136bd2305a24877f40d6 Mon Sep 17 00:00:00 2001 From: Pawel Osciak Date: Mon, 14 Mar 2011 10:38:24 -0300 Subject: [PATCH] --- yaml --- r: 242189 b: refs/heads/master c: 472af2b05bdefcaee7e754e22cbf131110017ad6 h: refs/heads/master i: 242187: e488f716475763c44d9e7795f518e47ba2d4a2bd v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf2-dma-contig.c | 2 +- trunk/include/media/videobuf2-dma-contig.h | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) 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 +#include -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);