From 4bbc9a79e6e46d8ea7caf24963a88b5329d54d31 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 18 Mar 2013 16:55:49 +0100 Subject: [PATCH] --- yaml --- r: 361615 b: refs/heads/master c: 039eb75350acd1131a18a9bd12a0d4e1fb17892e h: refs/heads/master i: 361613: 110e1f449ac602c8d9965b9c224a4c797eca81bf 361611: bffb823ac95fd2f36f8da15794da913b3261db75 361607: 311c31aed8a4208d3a0d2d68ea9b833e262bc8a9 361599: 445f1b17339f46853e985191abfbc3f09f065cd8 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_cirrus.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 19d2fd67d0bd..e8ac3d21090c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a86b1a2cd2f81f74e815e07f756edd7bc5b6f034 +refs/heads/master: 039eb75350acd1131a18a9bd12a0d4e1fb17892e diff --git a/trunk/sound/pci/hda/patch_cirrus.c b/trunk/sound/pci/hda/patch_cirrus.c index 60d08f669f0c..0d9c58f13560 100644 --- a/trunk/sound/pci/hda/patch_cirrus.c +++ b/trunk/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); } }