Commit 6e1f4df7 authored Mar 27, 2010 by istvan_v@mailbox.hu Committed by Mauro Carvalho Chehab May 19, 2010

V4L/DVB: cx88: fix checks for analog TV inputs



The following patch fixes code that checks for CX88_VMUX_TELEVISION,
but not CX88_VMUX_CABLE. This prevented for example the audio standard
from being set when using the cable input.

Signed-off-by: Istvan Varga <istvanv@users.sourceforge.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 10f1a6e8

drivers/media/video/cx88/cx88-core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -847,7 +847,8 @@ static int set_tvaudio(struct cx88_core *core)
		{
		v4l2_std_id norm = core->tvnorm;

		if (CX88_VMUX_TELEVISION != INPUT(core->input).type)
		if (CX88_VMUX_TELEVISION != INPUT(core->input).type &&
		CX88_VMUX_CABLE != INPUT(core->input).type)
		return 0;

		if (V4L2_STD_PAL_BG & norm) {

drivers/media/video/cx88/cx88-video.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -431,7 +431,8 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
		/* cx2388's C-ADC is connected to the tuner only.
		When used with S-Video, that ADC is busy dealing with
		chroma, so an external must be used for baseband audio */
		if (INPUT(input).type != CX88_VMUX_TELEVISION ) {
		if (INPUT(input).type != CX88_VMUX_TELEVISION &&
		INPUT(input).type != CX88_VMUX_CABLE) {
		/* "I2S ADC mode" */
		core->tvaudio = WW_I2SADC;
		cx88_set_tvaudio(core);