aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88
diff options
context:
space:
mode:
authoristvan_v@mailbox.hu <istvan_v@mailbox.hu>2010-03-27 08:31:32 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:57:21 -0400
commit6e1f4df7da6edd21a184daff023a8eef67f005dc (patch)
tree8aee37189ca67633108f86fd2dfd27ebfb48937e /drivers/media/video/cx88
parent10f1a6e8eda5cccc2753955ae81fa217d75bf68d (diff)
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>
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r--drivers/media/video/cx88/cx88-core.c3
-rw-r--r--drivers/media/video/cx88/cx88-video.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index b35411160f04..8b21457111b1 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -847,7 +847,8 @@ static int set_tvaudio(struct cx88_core *core)
847{ 847{
848 v4l2_std_id norm = core->tvnorm; 848 v4l2_std_id norm = core->tvnorm;
849 849
850 if (CX88_VMUX_TELEVISION != INPUT(core->input).type) 850 if (CX88_VMUX_TELEVISION != INPUT(core->input).type &&
851 CX88_VMUX_CABLE != INPUT(core->input).type)
851 return 0; 852 return 0;
852 853
853 if (V4L2_STD_PAL_BG & norm) { 854 if (V4L2_STD_PAL_BG & norm) {
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 0a3849c710f8..f5d1d89bdc26 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -426,12 +426,13 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
426 if (core->board.audio_chip && 426 if (core->board.audio_chip &&
427 core->board.audio_chip == V4L2_IDENT_WM8775) { 427 core->board.audio_chip == V4L2_IDENT_WM8775) {
428 call_all(core, audio, s_routing, 428 call_all(core, audio, s_routing,
429 INPUT(input).audioroute, 0, 0); 429 INPUT(input).audioroute, 0, 0);
430 } 430 }
431 /* cx2388's C-ADC is connected to the tuner only. 431 /* cx2388's C-ADC is connected to the tuner only.
432 When used with S-Video, that ADC is busy dealing with 432 When used with S-Video, that ADC is busy dealing with
433 chroma, so an external must be used for baseband audio */ 433 chroma, so an external must be used for baseband audio */
434 if (INPUT(input).type != CX88_VMUX_TELEVISION ) { 434 if (INPUT(input).type != CX88_VMUX_TELEVISION &&
435 INPUT(input).type != CX88_VMUX_CABLE) {
435 /* "I2S ADC mode" */ 436 /* "I2S ADC mode" */
436 core->tvaudio = WW_I2SADC; 437 core->tvaudio = WW_I2SADC;
437 cx88_set_tvaudio(core); 438 cx88_set_tvaudio(core);