Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf944ee5 authored by Florian Zumbiehl's avatar Florian Zumbiehl Committed by Takashi Iwai
Browse files

ALSA: cs46xx: Fix cpu idling with resume 



Make sure that capture DMA doesn't stay enabled after system resume
as that potentially prevents the processor from entering deep sleep
states.

Signed-off-by: default avatarFlorian Zumbiehl <florz@florz.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6250b9ce

sound/pci/cs46xx/cs46xx_lib.c

+10 −0
Original line number Diff line number Diff line
@@ -3644,6 +3644,7 @@ int snd_cs46xx_resume(struct pci_dev *pci) 
#ifdef CONFIG_SND_CS46XX_NEW_DSP

	int i;

#endif

	unsigned int tmp;



	pci_set_power_state(pci, PCI_D0);

	pci_restore_state(pci);
@@ -3685,6 +3686,15 @@ int snd_cs46xx_resume(struct pci_dev *pci) 
	snd_ac97_resume(chip->ac97[CS46XX_PRIMARY_CODEC_INDEX]);

	snd_ac97_resume(chip->ac97[CS46XX_SECONDARY_CODEC_INDEX]);



	/*

         *  Stop capture DMA.

	 */

	tmp = snd_cs46xx_peek(chip, BA1_CCTL);

	chip->capt.ctl = tmp & 0x0000ffff;

	snd_cs46xx_poke(chip, BA1_CCTL, tmp & 0xffff0000);



	mdelay(5);



	/* reset playback/capture */

	snd_cs46xx_set_play_sample_rate(chip, 8000);

	snd_cs46xx_set_capture_sample_rate(chip, 8000);