summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorConnor McAdams <conmanx360@gmail.com>2020-08-02 20:29:25 -0400
committerTakashi Iwai <tiwai@suse.de>2020-08-03 08:11:40 +0200
commita00dc409de455b64e6cb2f6d40cdb8237cdb2e83 (patch)
tree735efa7ca6e7bfc6e79d9b931e8b88d8d51cd83d /sound/pci
parent3b5d1afd1f13bcab85eaa28223ad396694f929e3 (diff)
downloadlwn-a00dc409de455b64e6cb2f6d40cdb8237cdb2e83.tar.gz
lwn-a00dc409de455b64e6cb2f6d40cdb8237cdb2e83.zip
ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value.
When the ZxR headphone gain control was added, the ca0132_switch_get function was not updated, which meant that the changes to the control state were not saved when entering/exiting alsamixer. Signed-off-by: Connor McAdams <conmanx360@gmail.com> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200803002928.8638-1-conmanx360@gmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_ca0132.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 19c575fd28a1..2cbe01d59c16 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -5748,6 +5748,11 @@ static int ca0132_switch_get(struct snd_kcontrol *kcontrol,
return 0;
}
+ if (nid == ZXR_HEADPHONE_GAIN) {
+ *valp = spec->zxr_gain_set;
+ return 0;
+ }
+
return 0;
}