diff options
author | Pawel Osciak <pawel@osciak.com> | 2011-03-14 09:38:24 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 18:41:58 -0400 |
commit | 472af2b05bdefcaee7e754e22cbf131110017ad6 (patch) | |
tree | e3fe18e25905bb069518e00b5a4d2f75a58f42f9 /drivers/media | |
parent | d6db5bfe7fd6d4334a1460923ba8175f1a0ece2d (diff) |
[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>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/videobuf2-dma-contig.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index 90495b7b4ddf..58205d596138 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) | |||
78 | { | 78 | { |
79 | struct vb2_dc_buf *buf = buf_priv; | 79 | struct vb2_dc_buf *buf = buf_priv; |
80 | 80 | ||
81 | return (void *)buf->paddr; | 81 | return &buf->paddr; |
82 | } | 82 | } |
83 | 83 | ||
84 | static void *vb2_dma_contig_vaddr(void *buf_priv) | 84 | static void *vb2_dma_contig_vaddr(void *buf_priv) |