aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx231xx/cx231xx-video.c
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@hauppauge.com>2010-07-12 15:34:57 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 01:17:23 -0200
commit6e6a2ba9cf67b437c51baacd20d58112ad74d685 (patch)
tree61c95a8dcb9cd40fe0a3f0d23831811174cc1b78 /drivers/media/video/cx231xx/cx231xx-video.c
parent[media] cx231xx: Clear avmode bits before setting (diff)
downloadlinux-dev-6e6a2ba9cf67b437c51baacd20d58112ad74d685.tar.xz
linux-dev-6e6a2ba9cf67b437c51baacd20d58112ad74d685.zip
[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>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-video.c')
-rw-r--r--drivers/media/video/cx231xx/cx231xx-video.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index 03a94e6a30ef..06f492e7891d 100644
--- 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;