Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19336
Modified Files:
intel8x0.c intel8x0m.c
Log Message:
- probe only audio (intel8x0) or modem (intel8x0m) codecs.
- call snd_ac97_suspend() in the suspend callback.
Index: intel8x0.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- intel8x0.c 13 Apr 2004 16:22:54 -0000 1.134
+++ intel8x0.c 14 Apr 2004 17:24:32 -0000 1.135
@@ -1852,6 +1852,7 @@
memset(&ac97, 0, sizeof(ac97));
ac97.private_data = chip;
ac97.private_free = snd_intel8x0_mixer_free_ac97;
+ ac97.scaps = AC97_SCAP_SKIP_MODEM;
if (chip->device_type != DEVICE_ALI) {
glob_sta = igetdword(chip, ICHREG(GLOB_STA));
bus.write = snd_intel8x0_codec_write;
@@ -1900,7 +1901,8 @@
for (i = 0; i < codecs; i++) {
ac97.num = i;
if ((err = snd_ac97_mixer(pbus, &ac97, &x97)) < 0) {
- snd_printk(KERN_ERR "Unable to initialize codec #%d\n", i);
+ if (err != -EACCES)
+ snd_printk(KERN_ERR "Unable to initialize codec
#%d\n", i);
if (i == 0)
goto __err;
continue;
@@ -2203,6 +2205,9 @@
for (i = 0; i < chip->pcm_devs; i++)
snd_pcm_suspend_all(chip->pcm[i]);
+ for (i = 0; i < 3; i++)
+ if (chip->ac97[i])
+ snd_ac97_suspend(chip->ac97[i]);
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
return 0;
}
Index: intel8x0m.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0m.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- intel8x0m.c 13 Apr 2004 14:59:00 -0000 1.4
+++ intel8x0m.c 14 Apr 2004 17:24:32 -0000 1.5
@@ -902,6 +902,7 @@
memset(&ac97, 0, sizeof(ac97));
ac97.private_data = chip;
ac97.private_free = snd_intel8x0_mixer_free_ac97;
+ ac97.scaps = AC97_SCAP_SKIP_AUDIO;
glob_sta = igetdword(chip, ICHREG(GLOB_STA));
bus.write = snd_intel8x0_codec_write;
@@ -1085,6 +1086,8 @@
for (i = 0; i < chip->pcm_devs; i++)
snd_pcm_suspend_all(chip->pcm[i]);
+ if (chip->ac97)
+ snd_ac97_suspend(chip->ac97);
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
return 0;
}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
