diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-31 10:40:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-09 08:31:52 -0700 |
| commit | 2a69bac35f3667f380d83ca5ed5b880ee7133154 (patch) | |
| tree | c7dfc755ecc699f6b201ac6712940521888e7ec5 | |
| parent | 22e0422852d3aa14ad9f1793b8d7cb9e74b81608 (diff) | |
| download | linux-3.10-2a69bac35f3667f380d83ca5ed5b880ee7133154.tar.gz linux-3.10-2a69bac35f3667f380d83ca5ed5b880ee7133154.tar.bz2 linux-3.10-2a69bac35f3667f380d83ca5ed5b880ee7133154.zip | |
ALSA: hda - Fix mute-LED GPIO initialization for IDT codecs
commit 1f43f6c1bc8d740e75b4177eb29110858bb5fea2 upstream.
The IDT codecs initializes the GPIO setup for mute LEDs via
snd_hda_sync_vmaster_hook(). This works in most cases except for the
very first call, which is called before PCM and control creations.
Thus before Master switch is set manually via alsactl, the mute LED
may show the wrong state, depending on the polarity.
Now it's fixed by calling the LED-status update function manually when
no vmaster is set yet.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index cf41d9219a6..fd533124417 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -4437,7 +4437,13 @@ static int stac92xx_init(struct hda_codec *codec) snd_hda_jack_report_sync(codec); /* sync mute LED */ - snd_hda_sync_vmaster_hook(&spec->vmaster_mute); + if (spec->gpio_led) { + if (spec->vmaster_mute.hook) + snd_hda_sync_vmaster_hook(&spec->vmaster_mute); + else /* the very first init call doesn't have vmaster yet */ + stac92xx_update_led_status(codec, false); + } + if (spec->dac_list) stac92xx_power_down(codec); return 0; |