From 916cbafdd88ca0494926795191eb094d80525dcf Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 7 Oct 2010 09:31:33 -0300 Subject: [PATCH] --- yaml --- r: 219232 b: refs/heads/master c: 1bede7521dbc12b386f72f26d41933789ccc9d7d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf-dma-sg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ebcfee2136d6..d8c960685567 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22c00854f3db563427527a8f71c20bd3943b13e0 +refs/heads/master: 1bede7521dbc12b386f72f26d41933789ccc9d7d diff --git a/trunk/drivers/media/video/videobuf-dma-sg.c b/trunk/drivers/media/video/videobuf-dma-sg.c index 7153e44efd52..20f227ee2b3e 100644 --- a/trunk/drivers/media/video/videobuf-dma-sg.c +++ b/trunk/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((unsigned)PAGE_SIZE, size), 0); - size -= min((unsigned)PAGE_SIZE, size); + sg_set_page(&sglist[i], pages[i], min_t(size_t, PAGE_SIZE, size), 0); + size -= min_t(size_t, PAGE_SIZE, size); } return sglist;