aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-03-12 20:28:04 +0100
committerTakashi Iwai <tiwai@suse.de>2015-03-12 20:28:04 +0100
commitbad994f5b4ab57eec8d56c180edca00505c3eeb2 (patch)
tree6dacf24e85c73ac8a9434653ae6bc0d039f3591a
parentfcdcd1dec6d2c7b718385ec743ae5a9a233edad4 (diff)
downloadlinux-yocto-4.8-bad994f5b4ab57eec8d56c180edca00505c3eeb2.tar.gz
linux-yocto-4.8-bad994f5b4ab57eec8d56c180edca00505c3eeb2.tar.bz2
linux-yocto-4.8-bad994f5b4ab57eec8d56c180edca00505c3eeb2.zip
ALSA: hda - Set single_adc_amp flag for CS420x codecs
CS420x codecs seem to deal only the single amps of ADC nodes even though the nodes receive multiple inputs. This leads to the inconsistent amp value after S3/S4 resume, for example. The fix is just to set codec->single_adc_amp flag. Then the driver handles these ADC amps as if single connections. Reported-and-tested-by: Vasil Zlatanov <vasil.zlatanov@gmail.com> Cc: <stable@vger.kernel.org> # 3.9+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_cirrus.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 1589c9bcce3e..ab687ffb28c2 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -584,6 +584,7 @@ static int patch_cs420x(struct hda_codec *codec)
return -ENOMEM;
spec->gen.automute_hook = cs_automute;
+ codec->single_adc_amp = 1;
snd_hda_pick_fixup(codec, cs420x_models, cs420x_fixup_tbl,
cs420x_fixups);