Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21673
Modified Files:
ac97_codec.c
Log Message:
Avoid warning message during codec probing in case SKIP_AUDIO flag is not set.
Index: ac97_codec.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- ac97_codec.c 24 May 2004 13:24:42 -0000 1.133
+++ ac97_codec.c 27 May 2004 18:15:54 -0000 1.134
@@ -1816,11 +1816,13 @@
bus->wait(ac97);
else {
udelay(50);
- err = -ENXIO;
- if (! (ac97->scaps & AC97_SCAP_SKIP_AUDIO))
- err = ac97_reset_wait(ac97, HZ/2, 0);
- if (err < 0 && ! (ac97->scaps & AC97_SCAP_SKIP_MODEM))
+ if (ac97->scaps & AC97_SCAP_SKIP_AUDIO)
err = ac97_reset_wait(ac97, HZ/2, 1);
+ else {
+ err = ac97_reset_wait(ac97, HZ/2, 0);
+ if (err < 0)
+ err = ac97_reset_wait(ac97, 0, 1);
+ }
if (err < 0) {
snd_printk(KERN_WARNING "AC'97 %d does not respond - RESET\n",
ac97->num);
/* proceed anyway - it's often non-critical */
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
