Update of /cvsroot/alsa/alsa-kernel/pci/ymfpci
In directory sc8-pr-cvs1:/tmp/cvs-serv2662/pci/ymfpci
Modified Files:
ymfpci_main.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: ymfpci_main.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ymfpci/ymfpci_main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ymfpci_main.c 19 Nov 2002 17:22:03 -0000 1.26
+++ ymfpci_main.c 7 Jan 2003 10:25:28 -0000 1.27
@@ -2127,9 +2127,8 @@
snd_card_t *card = chip->card;
int i;
- snd_power_lock(card);
if (card->power_state == SNDRV_CTL_POWER_D3hot)
- goto __skip;
+ return;
snd_pcm_suspend_all(chip->pcm);
snd_pcm_suspend_all(chip->pcm2);
snd_pcm_suspend_all(chip->pcm_spdif);
@@ -2140,8 +2139,6 @@
snd_ymfpci_writel(chip, YDSXGR_NATIVEDACOUTVOL, 0);
snd_ymfpci_disable_dsp(chip);
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
- __skip:
- snd_power_unlock(card);
}
void snd_ymfpci_resume(ymfpci_t *chip)
@@ -2149,10 +2146,8 @@
snd_card_t *card = chip->card;
int i;
- snd_power_lock(card);
-
if (card->power_state == SNDRV_CTL_POWER_D0)
- goto __skip;
+ return;
pci_enable_device(chip->pci);
pci_set_master(chip->pci);
@@ -2174,8 +2169,6 @@
spin_unlock(&chip->reg_lock);
}
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
- __skip:
- snd_power_unlock(card);
}
static int snd_ymfpci_set_power_state(snd_card_t *card, unsigned int power_state)
-------------------------------------------------------
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
