diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-21 12:05:34 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-21 12:05:34 +0800 |
| commit | e9cd0f1ce300f433a478bd1973dea112b5fbb800 (patch) | |
| tree | 11c64ff5cd0ef07c716d998a972feaf550fb21f5 /sound/pci/hda/patch_cirrus.c | |
| parent | 24284529d5e0b544b87f340850bf51690d50f573 (diff) | |
| parent | f151e73cea45b97a5690806f3391d10e547d04d9 (diff) | |
Merge tag 'v3.18.31' into linux-linaro-lsk-v3.18
This is the 3.18.31 stable release
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
| -rw-r--r-- | sound/pci/hda/patch_cirrus.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index e9eec080e46c..087228a0bcea 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -174,8 +174,12 @@ static void cs_automute(struct hda_codec *codec) snd_hda_gen_update_outputs(codec); if (spec->gpio_eapd_hp || spec->gpio_eapd_speaker) { - spec->gpio_data = spec->gen.hp_jack_present ? - spec->gpio_eapd_hp : spec->gpio_eapd_speaker; + if (spec->gen.automute_speaker) + spec->gpio_data = spec->gen.hp_jack_present ? + spec->gpio_eapd_hp : spec->gpio_eapd_speaker; + else + spec->gpio_data = + spec->gpio_eapd_hp | spec->gpio_eapd_speaker; snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, spec->gpio_data); } |