diff options
| author |   Devin Heitmueller <dheitmueller@hauppauge.com> | 2010-07-12 15:34:57 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:17:23 -0200 |
| commit | 6e6a2ba9cf67b437c51baacd20d58112ad74d685 (patch) | |
| tree | 61c95a8dcb9cd40fe0a3f0d23831811174cc1b78 | |
| parent | [media] cx231xx: Clear avmode bits before setting (diff) | |
| download | linux-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>
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-core.c | 6 | ||||
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-video.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c index 7beb201141c4..4fc62c4f738f 100644 --- 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 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; |