summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-11-11 17:54:19 +0100
committerTakashi Iwai <tiwai@suse.de>2011-11-16 11:14:04 +0100
commit344b01aecdc1e1173b5aa86208ef583489de7710 (patch)
tree3f70ea134d43ae302a66991f49dcc4e92eac0480 /sound
parentcfc7c9d307b6a3557e333f960218d344d3a70ce7 (diff)
downloadop-kernel-dev-344b01aecdc1e1173b5aa86208ef583489de7710.zip
op-kernel-dev-344b01aecdc1e1173b5aa86208ef583489de7710.tar.gz
ALSA: hda/jack - Fix the assignment of input jack-type
The type field was lost during the transition. Restored. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_jack.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
index ef36cbb9..3bcf623 100644
--- a/sound/pci/hda/hda_jack.c
+++ b/sound/pci/hda/hda_jack.c
@@ -345,6 +345,7 @@ int snd_hda_input_jack_add(struct hda_codec *codec, hda_nid_t nid, int type,
err = snd_jack_new(codec->bus->card, name, type, &jack->jack);
if (err < 0)
return err;
+ jack->type = type;
jack->jack->private_data = jack;
jack->jack->private_free = hda_free_jack_priv;
return 0;
OpenPOWER on IntegriCloud