]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: hda - Set single_adc_amp flag for CS420x codecs
authorTakashi Iwai <tiwai@suse.de>
Thu, 12 Mar 2015 19:28:04 +0000 (20:28 +0100)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 23 Mar 2015 15:17:22 +0000 (15:17 +0000)
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: Luis Henriques <luis.henriques@canonical.com>
sound/pci/hda/patch_cirrus.c

index 387f0b55188914d3081444d1b573ea15ad1bab2c..8deff55271c69e58e199d71270e0bece8362ac82 100644 (file)
@@ -586,6 +586,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);