openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Devin Heitmueller 2010-07-12 15:34:57 -03:00 committed by Mauro Carvalho Chehab
parent cc355753e8
commit 6e6a2ba9cf
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/video/cx231xx/cx231xx-core.c
View File

@ -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);

4
drivers/media/video/cx231xx/cx231xx-video.c
View File

@ -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;