diff options
| author | Sujoy Gupta <sujoy@google.com> | 2006-09-30 06:55:29 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-10-03 15:14:48 -0300 |
| commit | 6eb32a792ec19816d68529805f8169ce3ba1b1a2 (patch) | |
| tree | 96eedab826e7c73ebbc6705ef1dd4c5e3c030b0b /drivers/media/video | |
| parent | f1db955acbda253051a3256708d0dbfec2781de2 (diff) | |
| download | linux-stable-6eb32a792ec19816d68529805f8169ce3ba1b1a2.tar.gz linux-stable-6eb32a792ec19816d68529805f8169ce3ba1b1a2.tar.bz2 linux-stable-6eb32a792ec19816d68529805f8169ce3ba1b1a2.zip | |
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>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/video-buf.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c index acc5ea936687..f429f49901b9 100644 --- a/drivers/media/video/video-buf.c +++ b/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); |