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

Commit 6e61246f authored by Ondrej Zary's avatar Ondrej Zary Committed by Takashi Iwai
Browse files

ALSA: ice1712: restore AK4xxx volumes on resume 



Also restore AK4xxx mixer volumes on resume for M-Audio ICE1712-based cards.
This fixes incorrect (sound working) zero mixer volumes after resume.

Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d272ccd0

sound/pci/ice1712/delta.c

+6 −3
Original line number Diff line number Diff line
@@ -579,7 +579,8 @@ static struct snd_ak4xxx_private akm_vx442_priv = { 
#ifdef CONFIG_PM_SLEEP

static int snd_ice1712_delta_resume(struct snd_ice1712 *ice)

{

	unsigned char akm_backup[AK4XXX_IMAGE_SIZE];

	unsigned char akm_img_bak[AK4XXX_IMAGE_SIZE];

	unsigned char akm_vol_bak[AK4XXX_IMAGE_SIZE];



	/* init spdif */

	switch (ice->eeprom.subvendor) {
@@ -604,9 +605,11 @@ static int snd_ice1712_delta_resume(struct snd_ice1712 *ice) 


	/* init codec and restore registers */

	if (ice->akm_codecs) {

		memcpy(akm_backup, ice->akm->images, sizeof(akm_backup));

		memcpy(akm_img_bak, ice->akm->images, sizeof(akm_img_bak));

		memcpy(akm_vol_bak, ice->akm->volumes, sizeof(akm_vol_bak));

		snd_akm4xxx_init(ice->akm);

		memcpy(ice->akm->images, akm_backup, sizeof(akm_backup));

		memcpy(ice->akm->images, akm_img_bak, sizeof(akm_img_bak));

		memcpy(ice->akm->volumes, akm_vol_bak, sizeof(akm_vol_bak));

		snd_akm4xxx_reset(ice->akm, 0);

	}