Browse Source

V4L/DVB (4685): Fix compiler warning in drivers/media/video/video-buf.c

Using a double cast to avoid compiler warnings when building for PAE. 
Compiler doesn't like direct casting of a 32 bit ptr to 64 bit integer.

Signed-off-by: Martin J. Bligh <mbligh@google.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Sujoy Gupta 19 years ago
parent
commit
6eb32a792e
1 changed files with 6 additions and 1 deletions
  1. 6 1
      drivers/media/video/video-buf.c

+ 6 - 1
drivers/media/video/video-buf.c

@@ -365,7 +365,12 @@ videobuf_iolock(struct videobuf_queue* q, struct videobuf_buffer *vb,
 		if (NULL == fbuf)
 			return -EINVAL;
 		/* FIXME: need sanity checks for vb->boff */
-		bus   = (dma_addr_t)fbuf->base + vb->boff;
+		/*
+		 * Using a double cast to avoid compiler warnings when
+		 * building for PAE. Compiler doesn't like direct casting
+		 * of a 32 bit ptr to 64 bit integer.
+		 */
+		bus   = (dma_addr_t)(unsigned long)fbuf->base + vb->boff;
 		pages = PAGE_ALIGN(vb->size) >> PAGE_SHIFT;
 		err = videobuf_dma_init_overlay(&vb->dma,PCI_DMA_FROMDEVICE,
 						bus, pages);