aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/videobuf-dma-sg.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-10-06 20:57:04 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:06:21 -0400
commitd026d8284378110c8629a259caaccae4628f1ce0 (patch)
treeba59167fc4954bc5c1ea5a112dac46e319fcffff /drivers/media/video/videobuf-dma-sg.c
parent266815e25522879cf10d4a8677f1589b7b67ee68 (diff)
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>
Diffstat (limited to 'drivers/media/video/videobuf-dma-sg.c')
-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,
116 goto nopage; 116 goto nopage;
117 if (PageHighMem(pages[i])) 117 if (PageHighMem(pages[i]))
118 goto highmem; 118 goto highmem;
119 sg_set_page(&sglist[i], pages[i], min(PAGE_SIZE, size), 0); 119 sg_set_page(&sglist[i], pages[i], min((unsigned)PAGE_SIZE, size), 0);
120 size -= min(PAGE_SIZE, size); 120 size -= min((unsigned)PAGE_SIZE, size);
121 } 121 }
122 return sglist; 122 return sglist;
123 123