media: videobuf2: import HTC videobuf2 stack
HTC kernel version: villeu-jb-crc-3.4.10-ae8b65e
Change-Id: I8ccd6d1bb102c88602abc8b8ca542b55c30220bc
diff --git a/include/media/videobuf2-dma-contig.h b/include/media/videobuf2-dma-contig.h
index 19ae1e3..7e6c68b 100644
--- a/include/media/videobuf2-dma-contig.h
+++ b/include/media/videobuf2-dma-contig.h
@@ -17,11 +17,11 @@
#include <linux/dma-mapping.h>
static inline dma_addr_t
-vb2_dma_contig_plane_dma_addr(struct vb2_buffer *vb, unsigned int plane_no)
+vb2_dma_contig_plane_paddr(struct vb2_buffer *vb, unsigned int plane_no)
{
- dma_addr_t *addr = vb2_plane_cookie(vb, plane_no);
+ dma_addr_t *paddr = vb2_plane_cookie(vb, plane_no);
- return *addr;
+ return *paddr;
}
void *vb2_dma_contig_init_ctx(struct device *dev);