Update of /cvsroot/alsa/alsa-kernel/pci/trident
In directory sc8-pr-cvs1:/tmp/cvs-serv2662/pci/trident
Modified Files:
trident_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: trident_main.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/trident/trident_main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- trident_main.c 19 Dec 2002 16:26:30 -0000 1.20
+++ trident_main.c 7 Jan 2003 10:25:27 -0000 1.21
@@ -3732,9 +3732,8 @@
{
snd_card_t *card = trident->card;
- snd_power_lock(card);
if (card->power_state == SNDRV_CTL_POWER_D3hot)
- goto __skip;
+ return;
snd_pcm_suspend_all(trident->pcm);
if (trident->foldback)
snd_pcm_suspend_all(trident->foldback);
@@ -3748,17 +3747,14 @@
break;
}
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
- __skip:
- snd_power_unlock(card);
}
void snd_trident_resume(trident_t *trident)
{
snd_card_t *card = trident->card;
- snd_power_lock(card);
if (card->power_state == SNDRV_CTL_POWER_D0)
- goto __skip;
+ return;
switch (trident->device) {
case TRIDENT_DEVICE_ID_DX:
case TRIDENT_DEVICE_ID_NX:
@@ -3767,8 +3763,6 @@
break;
}
snd_power_change_state(card, SNDRV_CTL_POWER_D0);
- __skip:
- snd_power_unlock(card);
}
static int snd_trident_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
