From 9e6c65641bafdfc9492869a89072c7dabc5d4f9d Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@booyaka.com>
Date: Sat, 9 Oct 2010 01:31:40 -0300
Subject: [PATCH] --- yaml --- r: 219350 b: refs/heads/master c:
 2962fc0120dc73a17fdf350754c9a3c15726baaa h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c9e0f0191d1c..8d6aac67c513 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a06423c9a264d99345e1b5a04d5ced1168c609b8
+refs/heads/master: 2962fc0120dc73a17fdf350754c9a3c15726baaa
diff --git a/trunk/drivers/media/video/tvp5150.c b/trunk/drivers/media/video/tvp5150.c
index d62a78688b08..58927664d3ea 100644
--- a/trunk/drivers/media/video/tvp5150.c
+++ b/trunk/drivers/media/video/tvp5150.c
@@ -276,7 +276,7 @@ static int tvp5150_log_status(struct v4l2_subdev *sd)
 
 static inline void tvp5150_selmux(struct v4l2_subdev *sd)
 {
-	int opmode=0;
+	int opmode = 0;
 	struct tvp5150 *decoder = to_tvp5150(sd);
 	int input = 0;
 	unsigned char val;
@@ -289,12 +289,10 @@ static inline void tvp5150_selmux(struct v4l2_subdev *sd)
 		input |= 2;
 		/* fall through */
 	case TVP5150_COMPOSITE0:
-		opmode=0x30;		/* TV Mode */
 		break;
 	case TVP5150_SVIDEO:
 	default:
 		input |= 1;
-		opmode=0;		/* Auto Mode */
 		break;
 	}