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

Commit d565b353 authored by Jonathan Teh's avatar Jonathan Teh Committed by Greg Kroah-Hartman
Browse files

ALSA: cmipci: Restore aux vol on suspend/resume 



commit c14231cc04337c2c2a937db084af342ce704dbde upstream.

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.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9703abab

sound/pci/cmipci.c

+1 −2
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address."); 
#define CM_MICGAINZ		0x01	/* mic boost */

#define CM_MICGAINZ_SHIFT	0



#define CM_REG_MIXER3		0x24

#define CM_REG_AUX_VOL		0x26

#define CM_VAUXL_MASK		0xf0

#define CM_VAUXR_MASK		0x0f
@@ -3326,7 +3325,7 @@ static void snd_cmipci_remove(struct pci_dev *pci) 
 */

static unsigned char saved_regs[] = {

	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_CH1_FRAME1, CM_REG_CH1_FRAME2, CM_REG_EXT_MISC,

	CM_REG_INT_STATUS, CM_REG_INT_HLDCLR, CM_REG_FUNCTRL0,