diff options
| author | Mauro Carvalho Chehab | 2010-10-07 14:31:33 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2010-10-21 05:17:00 +0200 |
| commit | 1bede7521dbc12b386f72f26d41933789ccc9d7d (patch) | |
| tree | 82bf713b49ed99da9f478865507a2a9aafbf27d0 /drivers/media/video/videobuf-dma-sg.c | |
| parent | [media] lirc: Make struct file_operations pointer const (diff) | |
| download | kernel-qcow2-linux-1bede7521dbc12b386f72f26d41933789ccc9d7d.tar.gz kernel-qcow2-linux-1bede7521dbc12b386f72f26d41933789ccc9d7d.tar.xz kernel-qcow2-linux-1bede7521dbc12b386f72f26d41933789ccc9d7d.zip | |
[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>
Diffstat (limited to 'drivers/media/video/videobuf-dma-sg.c')
| -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, 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; |