Merge x86-64 update from Andi

[powerpc.git] / sound / pci / ac97 / ac97_patch.c

diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index ffc8d65..de1c72a 100644 (file)
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -170,7 +170,7 @@ static inline int is_surround_on(ac97_t *ac97)
 
 static inline int is_clfe_on(ac97_t *ac97)
 {
-       return a97->channel_mode >= 2;
+       return ac97->channel_mode >= 2;
 }
 
 static inline int is_shared_linein(ac97_t *ac97)
@@ -1460,7 +1460,8 @@ int patch_ad1881(ac97_t * ac97)
        codecs[1] = patch_ad1881_unchained(ac97, 1, (1<<14));
        codecs[2] = patch_ad1881_unchained(ac97, 2, (1<<13));
 
-       snd_runtime_check(codecs[0] | codecs[1] | codecs[2], goto __end);
+       if (! (codecs[0] || codecs[1] || codecs[2]))
+               goto __end;
 
        for (idx = 0; idx < 3; idx++)
                if (ac97->spec.ad18xx.unchained[idx])