summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-10-06 21:57:04 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 01:06:21 -0200
commitd026d8284378110c8629a259caaccae4628f1ce0 (patch)
treeba59167fc4954bc5c1ea5a112dac46e319fcffff
parent266815e25522879cf10d4a8677f1589b7b67ee68 (diff)
downloadblackbird-op-linux-d026d8284378110c8629a259caaccae4628f1ce0.tar.gz
blackbird-op-linux-d026d8284378110c8629a259caaccae4628f1ce0.zip
V4L/DVB: videobuf-dma-sg: Fix a warning due to the usage of min(PAGE_SIZE, arg)
drivers/media/video/videobuf-dma-sg.c: In function ‘videobuf_pages_to_sg’: drivers/media/video/videobuf-dma-sg.c:119: warning: comparison of distinct pointer types lacks a cast drivers/media/video/videobuf-dma-sg.c:120: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/videobuf-dma-sg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 359f2f3fdc77..7153e44efd52 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -116,8 +116,8 @@ static struct scatterlist *videobuf_pages_to_sg(struct page **pages,
goto nopage;
if (PageHighMem(pages[i]))
goto highmem;
- sg_set_page(&sglist[i], pages[i], min(PAGE_SIZE, size), 0);
- size -= min(PAGE_SIZE, size);
+ sg_set_page(&sglist[i], pages[i], min((unsigned)PAGE_SIZE, size), 0);
+ size -= min((unsigned)PAGE_SIZE, size);
}
return sglist;
OpenPOWER on IntegriCloud