diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-03-18 16:55:49 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-03-18 16:55:49 +0100 |
| commit | 039eb75350acd1131a18a9bd12a0d4e1fb17892e (patch) | |
| tree | 33f2f7d412ffda7546393f54d8623435ed5573fa /sound | |
| parent | a86b1a2cd2f81f74e815e07f756edd7bc5b6f034 (diff) | |
| download | linux-stable-039eb75350acd1131a18a9bd12a0d4e1fb17892e.tar.gz linux-stable-039eb75350acd1131a18a9bd12a0d4e1fb17892e.tar.bz2 linux-stable-039eb75350acd1131a18a9bd12a0d4e1fb17892e.zip | |
ALSA: hda - Fix yet missing GPIO/EAPD setup in cirrus driver
I forgot to update spec->gpio_data in the automute hook, so it will be
overridden at the init sequence, thus the machine is still silent when
no headphone jack is plugged at boot time.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_cirrus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 60d08f669f0c..0d9c58f13560 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -168,10 +168,10 @@ static void cs_automute(struct hda_codec *codec) snd_hda_gen_update_outputs(codec); if (spec->gpio_eapd_hp) { - unsigned int gpio = spec->gen.hp_jack_present ? + spec->gpio_data = spec->gen.hp_jack_present ? spec->gpio_eapd_hp : spec->gpio_eapd_speaker; snd_hda_codec_write(codec, 0x01, 0, - AC_VERB_SET_GPIO_DATA, gpio); + AC_VERB_SET_GPIO_DATA, spec->gpio_data); } } |