From 8df866102b2dec534d4df169913fee6c2d36334e Mon Sep 17 00:00:00 2001
From: Sujoy Gupta <sujoy@google.com>
Date: Sat, 30 Sep 2006 06:55:29 -0300
Subject: [PATCH] --- yaml --- r: 38270 b: refs/heads/master c:
 6eb32a792ec19816d68529805f8169ce3ba1b1a2 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/media/video/video-buf.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 057851d71b9f..1593ae20f9e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1db955acbda253051a3256708d0dbfec2781de2
+refs/heads/master: 6eb32a792ec19816d68529805f8169ce3ba1b1a2
diff --git a/trunk/drivers/media/video/video-buf.c b/trunk/drivers/media/video/video-buf.c
index acc5ea936687..f429f49901b9 100644
--- a/trunk/drivers/media/video/video-buf.c
+++ b/trunk/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);