summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Osciak <pawel@osciak.com>2011-03-14 10:38:24 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 19:41:58 -0300
commit472af2b05bdefcaee7e754e22cbf131110017ad6 (patch)
treee3fe18e25905bb069518e00b5a4d2f75a58f42f9
parentd6db5bfe7fd6d4334a1460923ba8175f1a0ece2d (diff)
downloadop-kernel-dev-472af2b05bdefcaee7e754e22cbf131110017ad6.zip
op-kernel-dev-472af2b05bdefcaee7e754e22cbf131110017ad6.tar.gz
[media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
dma_addr_t may not fit into void* on some architectures. To be safe, make vb2_dma_contig_cookie() return a pointer to dma_addr_t and dereference it in vb2_dma_contig_plane_paddr() back to dma_addr_t. Signed-off-by: Pawel Osciak <pawel@osciak.com> Reported-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/videobuf2-dma-contig.c2
-rw-r--r--include/media/videobuf2-dma-contig.h9
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c
index 90495b7..58205d5 100644
--- a/drivers/media/video/videobuf2-dma-contig.c
+++ b/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/include/media/videobuf2-dma-contig.h b/include/media/videobuf2-dma-contig.h
index 1d6188d..7e6c68b 100644
--- a/include/media/videobuf2-dma-contig.h
+++ b/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);
OpenPOWER on IntegriCloud