diff options
| author | Ondrej Zary <linux@rainbow-software.org> | 2014-04-03 23:09:37 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-04-04 16:22:34 +0200 |
| commit | 6e61246f5aeaede80e7a00e8b1de7ae07b1315e7 (patch) | |
| tree | dd54ab8ac7d485ba924e4e1837169fc1f720a4cd /sound | |
| parent | d272ccd0d084766a3e2adba10bea47091b6d68e7 (diff) | |
| download | op-kernel-dev-6e61246f5aeaede80e7a00e8b1de7ae07b1315e7.zip op-kernel-dev-6e61246f5aeaede80e7a00e8b1de7ae07b1315e7.tar.gz | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/ice1712/delta.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c index b3eed8d..496dbd0 100644 --- a/sound/pci/ice1712/delta.c +++ b/sound/pci/ice1712/delta.c @@ -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); } |
