Skip to content

Commit 6936d2e

Browse files
jonathan-tehgregkh
authored andcommitted
ALSA: cmipci: Restore aux vol on suspend/resume
commit c14231c upstream. Save and restore CM_REG_AUX_VOL instead of register 0x24 twice on suspend/resume. Tested on CMI8738LX. Fixes: cb60e5f ("[ALSA] cmipci - Add PM support") Signed-off-by: Jonathan 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: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent cbd2712 commit 6936d2e

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

sound/pci/cmipci.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address.");
302302
#define CM_MICGAINZ 0x01 /* mic boost */
303303
#define CM_MICGAINZ_SHIFT 0
304304

305-
#define CM_REG_MIXER3 0x24
306305
#define CM_REG_AUX_VOL 0x26
307306
#define CM_VAUXL_MASK 0xf0
308307
#define CM_VAUXR_MASK 0x0f
@@ -3291,7 +3290,7 @@ static void snd_cmipci_remove(struct pci_dev *pci)
32913290
*/
32923291
static const unsigned char saved_regs[] = {
32933292
CM_REG_FUNCTRL1, CM_REG_CHFORMAT, CM_REG_LEGACY_CTRL, CM_REG_MISC_CTRL,
3294-
CM_REG_MIXER0, CM_REG_MIXER1, CM_REG_MIXER2, CM_REG_MIXER3, CM_REG_PLL,
3293+
CM_REG_MIXER0, CM_REG_MIXER1, CM_REG_MIXER2, CM_REG_AUX_VOL, CM_REG_PLL,
32953294
CM_REG_CH0_FRAME1, CM_REG_CH0_FRAME2,
32963295
CM_REG_CH1_FRAME1, CM_REG_CH1_FRAME2, CM_REG_EXT_MISC,
32973296
CM_REG_INT_STATUS, CM_REG_INT_HLDCLR, CM_REG_FUNCTRL0,

0 commit comments

Comments
 (0)