diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-03-12 20:28:04 +0100 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2015-03-28 09:50:10 -0400 |
commit | b0501ca4a61e9735a8375bb155ef5cebe25b2f80 (patch) | |
tree | 996604464a2f4a994b8bbfa7c60ce3131a858929 /sound | |
parent | e2b501a93a936b2b6b03f6237a161ce2ee1c26ff (diff) |
ALSA: hda - Set single_adc_amp flag for CS420x codecs
[ Upstream commit bad994f5b4ab57eec8d56c180edca00505c3eeb2 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/patch_cirrus.c | 1 |
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); |