diff --git a/[refs] b/[refs]
index 5241bfbc15be..0c338ac18f64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 266815e25522879cf10d4a8677f1589b7b67ee68
+refs/heads/master: d026d8284378110c8629a259caaccae4628f1ce0
diff --git a/trunk/drivers/media/video/videobuf-dma-sg.c b/trunk/drivers/media/video/videobuf-dma-sg.c
index 359f2f3fdc77..7153e44efd52 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(PAGE_SIZE, size), 0);
-		size -= min(PAGE_SIZE, size);
+		sg_set_page(&sglist[i], pages[i], min((unsigned)PAGE_SIZE, size), 0);
+		size -= min((unsigned)PAGE_SIZE, size);
 	}
 	return sglist;