ALSA: HDA: Fix automute for Cirrus Logic 421x

There was a bug in the automute logic causing speakers not to
mute when headphones were plugged in.

Cc: stable@kernel.org
Tested-by: Hsin-Yi Chen <hychen@canonical.com>
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 6 insertions, 8 deletions

diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 913955895094..ea660429713d 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -922,16 +922,14 @@ static void cs_automute(struct hda_codec *codec)
 
         /* mute speakers if spdif or hp jack is plugged in */
         for (i = 0; i < cfg->speaker_outs; i++) {
+                int pin_ctl = hp_present ? 0 : PIN_OUT;
+                /* detect on spdif is specific to CS421x */
+                if (spdif_present && (spec->vendor_nid == CS421X_VENDOR_NID))
+                        pin_ctl = 0;
+
                 nid = cfg->speaker_pins[i];
                 snd_hda_codec_write(codec, nid, 0,
-                                    AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                    hp_present ? 0 : PIN_OUT);
-                /* detect on spdif is specific to CS421x */
-                if (spec->vendor_nid == CS421X_VENDOR_NID) {
-                        snd_hda_codec_write(codec, nid, 0,
-                                        AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                        spdif_present ? 0 : PIN_OUT);
-                }
+                                    AC_VERB_SET_PIN_WIDGET_CONTROL, pin_ctl);
         }
         if (spec->gpio_eapd_hp) {
                 unsigned int gpio = hp_present ?