Commit c14231cc authored by Jonathan Teh's avatar Jonathan Teh Committed by Takashi Iwai

ALSA: cmipci: Restore aux vol on suspend/resume

Save and restore CM_REG_AUX_VOL instead of register 0x24 twice on
suspend/resume.

Tested on CMI8738LX.

Fixes: cb60e5f5 ("[ALSA] cmipci - Add PM support")
Signed-off-by: default avatarJonathan Teh <jonathan.teh@outlook.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/DBAPR04MB7366CB3EA9C8521C35C56E8B920E9@DBAPR04MB7366.eurprd04.prod.outlook.comSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b7557267
...@@ -298,7 +298,6 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address."); ...@@ -298,7 +298,6 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address.");
#define CM_MICGAINZ 0x01 /* mic boost */ #define CM_MICGAINZ 0x01 /* mic boost */
#define CM_MICGAINZ_SHIFT 0 #define CM_MICGAINZ_SHIFT 0
#define CM_REG_MIXER3 0x24
#define CM_REG_AUX_VOL 0x26 #define CM_REG_AUX_VOL 0x26
#define CM_VAUXL_MASK 0xf0 #define CM_VAUXL_MASK 0xf0
#define CM_VAUXR_MASK 0x0f #define CM_VAUXR_MASK 0x0f
...@@ -3265,7 +3264,7 @@ static int snd_cmipci_probe(struct pci_dev *pci, ...@@ -3265,7 +3264,7 @@ static int snd_cmipci_probe(struct pci_dev *pci,
*/ */
static const unsigned char saved_regs[] = { static const unsigned char saved_regs[] = {
CM_REG_FUNCTRL1, CM_REG_CHFORMAT, CM_REG_LEGACY_CTRL, CM_REG_MISC_CTRL, CM_REG_FUNCTRL1, CM_REG_CHFORMAT, CM_REG_LEGACY_CTRL, CM_REG_MISC_CTRL,
CM_REG_MIXER0, CM_REG_MIXER1, CM_REG_MIXER2, CM_REG_MIXER3, CM_REG_PLL, CM_REG_MIXER0, CM_REG_MIXER1, CM_REG_MIXER2, CM_REG_AUX_VOL, CM_REG_PLL,
CM_REG_CH0_FRAME1, CM_REG_CH0_FRAME2, CM_REG_CH0_FRAME1, CM_REG_CH0_FRAME2,
CM_REG_CH1_FRAME1, CM_REG_CH1_FRAME2, CM_REG_EXT_MISC, CM_REG_CH1_FRAME1, CM_REG_CH1_FRAME2, CM_REG_EXT_MISC,
CM_REG_INT_STATUS, CM_REG_INT_HLDCLR, CM_REG_FUNCTRL0, CM_REG_INT_STATUS, CM_REG_INT_HLDCLR, CM_REG_FUNCTRL0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment