ALSA: hda/jack - Fix the assignment of input jack-type
authorTakashi Iwai <tiwai@suse.de>
Fri, 11 Nov 2011 16:54:19 +0000 (17:54 +0100)
committerLeann Ogasawara <leann.ogasawara@canonical.com>
Mon, 2 Apr 2012 20:18:17 +0000 (13:18 -0700)
The type field was lost during the transition.  Restored.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

(cherry picked from commit 344b01aecdc1e1173b5aa86208ef583489de7710)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

sound/pci/hda/hda_jack.c

index ef36cbb..3bcf623 100644 (file)
@@ -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;