---

yaml --- r: 219257 b: refs/heads/master c: 6e6a2ba h: refs/heads/master i: 219255: 210855e v: v3
git-mirror · Oct 21, 2010 · e884070 · e884070
1 parent b70f0f1
commit e884070
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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;