From 8b01a15606927b7f7b5222a703b20e39f8e8d28c Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 12 Jul 2012 10:47:28 -0300
Subject: [PATCH] --- yaml --- r: 320655 b: refs/heads/master c:
 afcc8e8c3474e5771ebdd49fe4f1c2ec1df997e7 h: refs/heads/master i:   320653:
 5128069d46fbf584d1aec416afa1507ee7375967   320651:
 49bb04e6e6748bae3d78ed9e89b8b3ca43ca2922   320647:
 2d2dad2f74bb92706e052733d61a5c3a0e53c1ce   320639:
 4eae4a9e6fdf16e89347f3df8d591dbae30943e5 v: v3

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

diff --git a/[refs] b/[refs]
index 7dd954b83aba..dc996d85aff2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79ef87edea252c3325f0be8aed684db72dc7e46c
+refs/heads/master: afcc8e8c3474e5771ebdd49fe4f1c2ec1df997e7
diff --git a/trunk/drivers/media/video/tvp5150.c b/trunk/drivers/media/video/tvp5150.c
index 0d897cb1774a..a751b6c146fd 100644
--- a/trunk/drivers/media/video/tvp5150.c
+++ b/trunk/drivers/media/video/tvp5150.c
@@ -257,7 +257,7 @@ static inline void tvp5150_selmux(struct v4l2_subdev *sd)
 	int opmode = 0;
 	struct tvp5150 *decoder = to_tvp5150(sd);
 	int input = 0;
-	unsigned char val;
+	int val;
 
 	if ((decoder->output & TVP5150_BLACK_SCREEN) || !decoder->enable)
 		input = 8;