Skip to content

Commit

Permalink
[media] cx231xx: do not call video_mux as part of isoc setup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Devin Heitmueller authored and Mauro Carvalho Chehab committed Oct 21, 2010
1 parent cc35575 commit 6e6a2ba
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
6 changes: 0 additions & 6 deletions drivers/media/video/cx231xx/cx231xx-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 3 additions & 1 deletion drivers/media/video/cx231xx/cx231xx-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6e6a2ba

Please sign in to comment.