[media] cx231xx: do not call video_mux as part of isoc setup

You cannot call the video_mux routine from within the isoc setup, because that
code is shared with the digital isoc handler.  This was causing the GPIOs and
power control to be put into the wrong state when starting up digital mode.

Signed-off-by: Devin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c
index 7beb201141c4d0066f5da252704a849b0dd20b7e..4fc62c4f738fa423c1e793059a90a741b3d3899b 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx-core.c
+++ b/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/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index 03a94e6a30ef060b75cb550952b12baf6d66d685..06f492e7891dbca962b3966fd593f82eb5a74efb 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/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;