diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-07 08:31:33 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:17:00 -0400 |
commit | 1bede7521dbc12b386f72f26d41933789ccc9d7d (patch) | |
tree | 82bf713b49ed99da9f478865507a2a9aafbf27d0 | |
parent | 22c00854f3db563427527a8f71c20bd3943b13e0 (diff) |
[media] videobuf-dma-sg: Use min_t(size_t, PAGE_SIZE ..)
As pointed by Laurent:
I think min_t(size_t, PAGE_SIZE, size) is the preferred way.
Thanks-to: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/videobuf-dma-sg.c | 4 |
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 7153e44efd52..20f227ee2b3e 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((unsigned)PAGE_SIZE, size), 0); | 119 | sg_set_page(&sglist[i], pages[i], min_t(size_t, PAGE_SIZE, size), 0); |
120 | size -= min((unsigned)PAGE_SIZE, size); | 120 | size -= min_t(size_t, PAGE_SIZE, size); |
121 | } | 121 | } |
122 | return sglist; | 122 | return sglist; |
123 | 123 | ||