From 207227feb9ef7cea6ba34e7f2a7af6cc381a2818 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 4 Nov 2009 13:11:10 -0300
Subject: [PATCH] --- yaml --- r: 168402 b: refs/heads/master c:
 2e8961330ec4b558a0f4db18ab5fb566842f492b h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/uvc/uvc_ctrl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b3876532410e..81fcbe719bbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2e35af6c756b5fa827fec5e0431cf2ce449beef
+refs/heads/master: 2e8961330ec4b558a0f4db18ab5fb566842f492b
diff --git a/trunk/drivers/media/video/uvc/uvc_ctrl.c b/trunk/drivers/media/video/uvc/uvc_ctrl.c
index c3225a561748..1b89735e62fd 100644
--- a/trunk/drivers/media/video/uvc/uvc_ctrl.c
+++ b/trunk/drivers/media/video/uvc/uvc_ctrl.c
@@ -348,7 +348,7 @@ static void uvc_ctrl_set_zoom(struct uvc_control_mapping *mapping,
 	__s32 value, __u8 *data)
 {
 	data[0] = value == 0 ? 0 : (value > 0) ? 1 : 0xff;
-	data[2] = min(abs(value), 0xff);
+	data[2] = min((int)abs(value), 0xff);
 }
 
 static struct uvc_control_mapping uvc_ctrl_mappings[] = {