From f2e2f82a407d8871cf0efd2c052b405b30c02d2a Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 13 Apr 2006 13:06:28 -0300 Subject: [PATCH] --- yaml --- r: 29859 b: refs/heads/master c: 7a3165a1520c608f10a66588ab48275e1ce253f5 h: refs/heads/master i: 29857: f79a61a79f1284d1d49eaba10a2130af313e3f93 29855: 824d79dae4c2d67856c7e778e60fb751f1d77d37 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-tvaudio.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 61040e532b6d..032cbee306d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3038304c91aa710fe651c7f42568e252fc54908 +refs/heads/master: 7a3165a1520c608f10a66588ab48275e1ce253f5 diff --git a/trunk/drivers/media/video/cx88/cx88-tvaudio.c b/trunk/drivers/media/video/cx88/cx88-tvaudio.c index 3d3376d590a5..210f9f7ebed4 100644 --- a/trunk/drivers/media/video/cx88/cx88-tvaudio.c +++ b/trunk/drivers/media/video/cx88/cx88-tvaudio.c @@ -148,11 +148,14 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) if (cx88_boards[core->board].blackbird) { /* sets sound input from external adc */ - if ((core->board == CX88_BOARD_HAUPPAUGE_ROSLYN)|| - (core->board == CX88_BOARD_KWORLD_MCE200_DELUXE)) + switch (core->board) { + case CX88_BOARD_HAUPPAUGE_ROSLYN: + case CX88_BOARD_KWORLD_MCE200_DELUXE: cx_clear(AUD_CTL, EN_I2SIN_ENABLE); - else + break; + default: cx_set(AUD_CTL, EN_I2SIN_ENABLE); + } cx_write(AUD_I2SINPUTCNTL, 4); cx_write(AUD_BAUDRATE, 1);