From: Takashi Iwai Date: Fri, 11 Nov 2011 16:54:19 +0000 (+0100) Subject: ALSA: hda/jack - Fix the assignment of input jack-type X-Git-Tag: upstream/snapshot3+hdmi~7307^2~116^2~13^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=344b01aecdc1e1173b5aa86208ef583489de7710;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git ALSA: hda/jack - Fix the assignment of input jack-type The type field was lost during the transition. Restored. Signed-off-by: Takashi Iwai --- 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;