summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-03-12 20:28:04 +0100
committerJiri Slaby <jslaby@suse.cz>2015-04-09 13:14:10 +0200
commit5917ae96d8a580dc1c94578e9d88af60ab0c56ed (patch)
tree87344777e1fa60d7797c0e23b11322924050c48d
parentcf0a9563e60a79def198736926eced80aa7725d4 (diff)
downloadlwn-5917ae96d8a580dc1c94578e9d88af60ab0c56ed.tar.gz
lwn-5917ae96d8a580dc1c94578e9d88af60ab0c56ed.zip
ALSA: hda - Set single_adc_amp flag for CS420x codecs
commit bad994f5b4ab57eec8d56c180edca00505c3eeb2 upstream. 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> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-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 072755c8289c..593b541d4f06 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -572,6 +572,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);