From e8840702dc16898eaa0afd934f45d048e03c3c4e Mon Sep 17 00:00:00 2001
From: Devin Heitmueller <dheitmueller@hauppauge.com>
Date: Mon, 12 Jul 2010 15:34:57 -0300
Subject: [PATCH] --- yaml --- r: 219257 b: refs/heads/master c:
 6e6a2ba9cf67b437c51baacd20d58112ad74d685 h: refs/heads/master i:   219255:
 210855ee7005afdf57265c5f27151394d5e44550 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/video/cx231xx/cx231xx-core.c  | 6 ------
 trunk/drivers/media/video/cx231xx/cx231xx-video.c | 4 +++-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 20d7edc2e530..7d2f2c02504b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc355753e860559744baf5ddb2fcf427433e0346
+refs/heads/master: 6e6a2ba9cf67b437c51baacd20d58112ad74d685
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-core.c b/trunk/drivers/media/video/cx231xx/cx231xx-core.c
index 7beb201141c4..4fc62c4f738f 100644
--- a/trunk/drivers/media/video/cx231xx/cx231xx-core.c
+++ b/trunk/drivers/media/video/cx231xx/cx231xx-core.c
@@ -1002,12 +1002,6 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,
 	int j, k;
 	int rc;
 
-	dev->video_input = dev->video_input > 2 ? 2 : dev->video_input;
-
-	cx231xx_coredbg("Setting Video mux to %d\n", dev->video_input);
-
-	video_mux(dev, dev->video_input);
-
 	/* De-allocates all pending stuff */
 	cx231xx_uninit_isoc(dev);
 
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-video.c b/trunk/drivers/media/video/cx231xx/cx231xx-video.c
index 03a94e6a30ef..06f492e7891d 100644
--- a/trunk/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/trunk/drivers/media/video/cx231xx/cx231xx-video.c
@@ -2667,7 +2667,9 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
 
 	/* Analog specific initialization */
 	dev->format = &format[0];
-	/* video_mux(dev, dev->video_input); */
+
+	/* Set the initial input */
+	video_mux(dev, dev->video_input);
 
 	/* Audio defaults */
 	dev->mute = 1;