diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-30 06:55:29 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-30 06:55:29 -0300 |
| commit | 471be2a7a8396a9654276c584d96a682e5e8cfa3 (patch) | |
| tree | 7d34e806dd65082d42993bf9c965c13492aca8c4 /linux/drivers/media/video | |
| parent | a67483ddcf1df21f151caedab677fcbe00174753 (diff) | |
| download | mediapointer-dvb-s2-471be2a7a8396a9654276c584d96a682e5e8cfa3.tar.gz mediapointer-dvb-s2-471be2a7a8396a9654276c584d96a682e5e8cfa3.tar.bz2 | |
fix compiler warning in drivers/media/video/video-buf.c
From: Sujoy Gupta <sujoy@google.com>
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 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/video-buf.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/video/video-buf.c b/linux/drivers/media/video/video-buf.c index 05532ee28..f1e7f298b 100644 --- a/linux/drivers/media/video/video-buf.c +++ b/linux/drivers/media/video/video-buf.c @@ -366,7 +366,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); |