diff mbox

[1/3] V4L/DVB: videobuf-dma-sg: Use min_t(size_t, PAGE_SIZE ..)

Message ID 20101007094543.47b77328@pedra (mailing list archive)
State Accepted
Headers show

Commit Message

Mauro Carvalho Chehab Oct. 7, 2010, 12:45 p.m. UTC
None
diff mbox

Patch

diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index 7153e44..20f227e 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;