From 9b0f70f3f37fbdfb799f48072a3f4db51f22bff0 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 6 Oct 2010 21:57:04 -0300
Subject: [PATCH] --- yaml --- r: 219227 b: refs/heads/master c:
 d026d8284378110c8629a259caaccae4628f1ce0 h: refs/heads/master i:   219225:
 3339332dae7f6e8e9b55f4ca6e4721af410ccccc   219223:
 30f9a9d4fa3b6deff8d191b6cb52d3e503ff427c v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/videobuf-dma-sg.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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;