summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-11-14 10:32:21 +0100
committerTakashi Iwai <tiwai@suse.de>2011-11-16 11:14:04 +0100
commitfc5b15f13886afad43fc6c0040af7cb5172a0bd8 (patch)
treed203fbd7af6c9de3ed2e3551ea503ad5a62df5c2 /sound
parent344b01aecdc1e1173b5aa86208ef583489de7710 (diff)
downloadop-kernel-dev-fc5b15f13886afad43fc6c0040af7cb5172a0bd8.zip
op-kernel-dev-fc5b15f13886afad43fc6c0040af7cb5172a0bd8.tar.gz
ALSA: hda - Add missing initialization of kctl jack status
Otherwise the jack kctls will report invalid values until the jack is re-plugged. Reported-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_jack.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
index 3bcf623..e014562 100644
--- a/sound/pci/hda/hda_jack.c
+++ b/sound/pci/hda/hda_jack.c
@@ -225,6 +225,8 @@ int snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid,
if (snd_hda_ctl_add(codec, nid, kctl) < 0)
return -ENOMEM;
jack->kctl = kctl;
+ snd_kctl_jack_report(codec->bus->card, kctl,
+ snd_hda_jack_detect(codec, nid));
return 0;
}
EXPORT_SYMBOL_HDA(snd_hda_jack_add_kctl);
OpenPOWER on IntegriCloud