Commit 6e6a2ba9 authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab

[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: default avatarDevin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cc355753
...@@ -1002,12 +1002,6 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets, ...@@ -1002,12 +1002,6 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,
int j, k; int j, k;
int rc; 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 */ /* De-allocates all pending stuff */
cx231xx_uninit_isoc(dev); cx231xx_uninit_isoc(dev);
......
...@@ -2667,7 +2667,9 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) ...@@ -2667,7 +2667,9 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
/* Analog specific initialization */ /* Analog specific initialization */
dev->format = &format[0]; dev->format = &format[0];
/* video_mux(dev, dev->video_input); */
/* Set the initial input */
video_mux(dev, dev->video_input);
/* Audio defaults */ /* Audio defaults */
dev->mute = 1; dev->mute = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment