]> err.no Git - linux-2.6/commitdiff
[ALSA] intel8x0 - Suppress the codec warnings during probing
authorTakashi Iwai <tiwai@suse.de>
Wed, 5 Oct 2005 17:47:41 +0000 (19:47 +0200)
committerJaroslav Kysela <perex@suse.cz>
Fri, 4 Nov 2005 12:17:26 +0000 (13:17 +0100)
Modules: Intel8x0 driver

Suppress the codec warnings during probing of codecs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/intel8x0.c

index bd9563c8b11ee3ed55811b56e91d1d9964d6158a..a82f3b62364b67ea2f6b094c48fde7f2e2a3c0c1 100644 (file)
@@ -600,16 +600,19 @@ static int snd_intel8x0_ali_codec_ready(intel8x0_t *chip, int mask)
                if (val & mask)
                        return 0;
        }
-       snd_printd(KERN_WARNING "intel8x0: AC97 codec ready timeout.\n");
+       if (! chip->in_ac97_init)
+               snd_printd(KERN_WARNING "intel8x0: AC97 codec ready timeout.\n");
        return -EBUSY;
 }
 
 static int snd_intel8x0_ali_codec_semaphore(intel8x0_t *chip)
 {
        int time = 100;
+       if (chip->buggy_semaphore)
+               return 0; /* just ignore ... */
        while (time-- && (igetdword(chip, ICHREG(ALI_CAS)) & ALI_CAS_SEM_BUSY))
                udelay(1);
-       if (! time)
+       if (! time && ! chip->in_ac97_init)
                snd_printk(KERN_WARNING "ali_codec_semaphore timeout\n");
        return snd_intel8x0_ali_codec_ready(chip, ALI_CSPSR_CODEC_READY);
 }