Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Ondrej Zary and committed by
Takashi Iwai
6e61246f d272ccd0

+6 -3
+6 -3
sound/pci/ice1712/delta.c
··· 579 579 #ifdef CONFIG_PM_SLEEP 580 580 static int snd_ice1712_delta_resume(struct snd_ice1712 *ice) 581 581 { 582 - unsigned char akm_backup[AK4XXX_IMAGE_SIZE]; 582 + unsigned char akm_img_bak[AK4XXX_IMAGE_SIZE]; 583 + unsigned char akm_vol_bak[AK4XXX_IMAGE_SIZE]; 583 584 584 585 /* init spdif */ 585 586 switch (ice->eeprom.subvendor) { ··· 605 604 606 605 /* init codec and restore registers */ 607 606 if (ice->akm_codecs) { 608 - memcpy(akm_backup, ice->akm->images, sizeof(akm_backup)); 607 + memcpy(akm_img_bak, ice->akm->images, sizeof(akm_img_bak)); 608 + memcpy(akm_vol_bak, ice->akm->volumes, sizeof(akm_vol_bak)); 609 609 snd_akm4xxx_init(ice->akm); 610 - memcpy(ice->akm->images, akm_backup, sizeof(akm_backup)); 610 + memcpy(ice->akm->images, akm_img_bak, sizeof(akm_img_bak)); 611 + memcpy(ice->akm->volumes, akm_vol_bak, sizeof(akm_vol_bak)); 611 612 snd_akm4xxx_reset(ice->akm, 0); 612 613 } 613 614