From 07139668beb17f47846847e13ded271895e5fe1b Mon Sep 17 00:00:00 2001 From: Rene Herman Date: Tue, 5 Aug 2008 09:33:33 +0200 Subject: [PATCH] --- yaml --- r: 110873 b: refs/heads/master c: 6ddfa7432adc24c7471abe9d338a78540d0d025b h: refs/heads/master i: 110871: 346664377031026c24711c7df7173b4dc4582ce6 v: v3 --- [refs] | 2 +- trunk/sound/isa/wss/wss_lib.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4195d7773612..629fe362acec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebae22590dccd2b8495c97e85290f5e07af7dc62 +refs/heads/master: 6ddfa7432adc24c7471abe9d338a78540d0d025b diff --git a/trunk/sound/isa/wss/wss_lib.c b/trunk/sound/isa/wss/wss_lib.c index fff8a3b79fdf..866e8686dbe7 100644 --- a/trunk/sound/isa/wss/wss_lib.c +++ b/trunk/sound/isa/wss/wss_lib.c @@ -1168,11 +1168,13 @@ static int snd_ad1848_probe(struct snd_wss *chip) ad1847 = 1; break; } - if (snd_wss_in(chip, CS4231_LEFT_INPUT) == 0xaa && - rev == 0x45) { - spin_unlock_irqrestore(&chip->reg_lock, flags); - id = 1; - break; + if (rev == 0x45) { + rev = snd_wss_in(chip, CS4231_LEFT_INPUT); + if (rev == 0xaa || rev == 0x8a) { + spin_unlock_irqrestore(&chip->reg_lock, flags); + id = 1; + break; + } } spin_unlock_irqrestore(&chip->reg_lock, flags); }