Update of /cvsroot/alsa/alsa-kernel/pci/nm256
In directory sc8-pr-cvs1:/tmp/cvs-serv2662/pci/nm256
Modified Files:
nm256.c
Log Message:
[PATCH: power-lock-fix.dif]
removed snd_power_lock/unlock from suspend/resume callbacks since
this will invoke sleep eventually.
snd_power_lock/unlock are called inside the control pm ioctl
globally, instead.
Index: nm256.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/nm256/nm256.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nm256.c 21 Oct 2002 18:28:25 -0000 1.21
+++ nm256.c 7 Jan 2003 10:25:27 -0000 1.22
@@ -1270,24 +1270,20 @@
{
snd_card_t *card = chip->card;
- snd_power_lock(card);
if (card->power_state == SNDRV_CTL_POWER_D3hot)
- goto __skip;
+ return;
snd_pcm_suspend_all(chip->pcm);
chip->coeffs_current = 0;
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
- __skip:
- snd_power_unlock(card);
}
static void nm256_resume(nm256_t *chip)
{
snd_card_t *card = chip->card;
- snd_power_lock(card);
if (card->power_state == SNDRV_CTL_POWER_D0)
- goto __skip;
+ return;
/* Perform a full reset on the hardware */
pci_enable_device(chip->pci);
@@ -1297,8 +1293,6 @@
snd_ac97_resume(chip->ac97);
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
- __skip:
- snd_power_unlock(card);
}
#ifndef PCI_OLD_SUSPEND
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
