---

yaml --- r: 219227 b: refs/heads/master c: d026d82 h: refs/heads/master i: 219225: 3339332 219223: 30f9a9d v: v3
git-mirror · Oct 21, 2010 · 9b0f70f · 9b0f70f
1 parent 657d765
commit 9b0f70f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;