Re: Linux 2.6.10-rc3

Martin Josefsson
2004-12-04T21:17:25Z

[-- Attachment #1: Type: text/plain, Size: 1494 bytes --]

On Sat, 2004-12-04 at 18:40, Alex Romosan wrote:
> Ari Pollak <aripollak@gmail.com> writes:
>
> > Alex Romosan wrote:
> >> well, it's still more than my thinkpad which doesn't want to wake up
> >> from sleep anymore.
> >
> > My thinkpad will resume fine if I remove the intel8x0 and intel8x0m
> > ALSA modules before going into suspend - works with both APM and ACPI,
> > though I don't really use ACPI suspend because the battery drains like
> > crazy.
>
> i saw there were some changes to alsa cvs having to do with the new
> pci device handling. i'll reconfigure the kernel with alsa as modules
> and try alsa cvs to see if that makes any difference. thanks.

This has been discussed in an earlier thread, I was hoping the ALSA
people would submit the patch but that hasn't happened.
I'll submit it in a separate mail.

Try the patch below, it should fix the problem.

--- linux/sound/core/init.c 8 Nov 2004 11:37:08 -0000 1.48
+++ linux/sound/core/init.c 12 Nov 2004 13:56:32 -0000
@@ -782,12 +782,15 @@
int snd_card_pci_suspend(struct pci_dev *dev, u32 state)
{
snd_card_t *card = pci_get_drvdata(dev);
+ int err;
if (! card || ! card->pm_suspend)
return 0;
if (card->power_state == SNDRV_CTL_POWER_D3hot)
return 0;
/* FIXME: correct state value? */
- return card->pm_suspend(card, 0);
+ err = card->pm_suspend(card, 0);
+ pci_save_state(dev);
+ return err;
}

int snd_card_pci_resume(struct pci_dev *dev)

--
/Martin

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]