]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value.
authorConnor McAdams <conmanx360@gmail.com>
Mon, 3 Aug 2020 00:29:25 +0000 (20:29 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Aug 2020 13:33:33 +0000 (15:33 +0200)
commit a00dc409de455b64e6cb2f6d40cdb8237cdb2e83 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/pci/hda/patch_ca0132.c

index d909db23a7eb0c80078b77596dc5d16892596e17..f250ae0a8cb2012aecee3f6fe93c118b8c768c69 100644 (file)
@@ -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;
 }