Merge branch 'topic/hda' into for-linus

* topic/hda:
  ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883
  ALSA: hda - Avoid call of snd_jack_report at release
  ALSA: add private_data to struct snd_jack

4 files changed, 45 insertions, 11 deletions

diff --git a/sound/core/jack.c b/sound/core/jack.c
index c8254c667c62..d54d1a05fe65 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -35,6 +35,9 @@ static int snd_jack_dev_free(struct snd_device *device)
 {
         struct snd_jack *jack = device->device_data;
 
+        if (jack->private_free)
+                jack->private_free(jack);
+
         /* If the input device is registered with the input subsystem
          * then we need to use a different deallocator. */
         if (jack->registered)
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 1f2ad76ca94b..56ce19e68cb5 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -350,12 +350,20 @@ static int conexant_mux_enum_put(struct snd_kcontrol *kcontrol,
 }
 
 #ifdef CONFIG_SND_JACK
+static void conexant_free_jack_priv(struct snd_jack *jack)
+{
+        struct conexant_jack *jacks = jack->private_data;
+        jacks->nid = 0;
+        jacks->jack = NULL;
+}
+
 static int conexant_add_jack(struct hda_codec *codec,
                 hda_nid_t nid, int type)
 {
         struct conexant_spec *spec;
         struct conexant_jack *jack;
         const char *name;
+        int err;
 
         spec = codec->spec;
         snd_array_init(&spec->jacks, sizeof(*jack), 32);
@@ -368,7 +376,12 @@ static int conexant_add_jack(struct hda_codec *codec,
         jack->nid = nid;
         jack->type = type;
 
-        return snd_jack_new(codec->bus->card, name, type, &jack->jack);
+        err = snd_jack_new(codec->bus->card, name, type, &jack->jack);
+        if (err < 0)
+                return err;
+        jack->jack->private_data = jack;
+        jack->jack->private_free = conexant_free_jack_priv;
+        return 0;
 }
 
 static void conexant_report_jack(struct hda_codec *codec, hda_nid_t nid)
@@ -455,8 +468,10 @@ static void conexant_free(struct hda_codec *codec)
         if (spec->jacks.list) {
                 struct conexant_jack *jacks = spec->jacks.list;
                 int i;
-                for (i = 0; i < spec->jacks.used; i++)
-                        snd_device_free(codec->bus->card, &jacks[i].jack);
+                for (i = 0; i < spec->jacks.used; i++, jacks++) {
+                        if (jacks->jack)
+                                snd_device_free(codec->bus->card, jacks->jack);
+                }
                 snd_array_free(&spec->jacks);
         }
 #endif
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index f35e58a2d921..6ed787eedd06 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -8742,10 +8742,9 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
         SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC883_LAPTOP_EAPD),
         SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch),
         SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION),
-        SND_PCI_QUIRK(0x1734, 0x1107, "FSC AMILO Xi2550",
+        SND_PCI_QUIRK_MASK(0x1734, 0xfff0, 0x1100, "FSC AMILO Xi/Pi25xx",
                       ALC883_FUJITSU_PI2515),
-        SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515),
-        SND_PCI_QUIRK(0x1734, 0x113d, "Fujitsu AMILO Xa3530",
+        SND_PCI_QUIRK_MASK(0x1734, 0xfff0, 0x1130, "Fujitsu AMILO Xa35xx",
                 ALC888_FUJITSU_XA3530),
         SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo 101e", ALC883_LENOVO_101E_2ch),
         SND_PCI_QUIRK(0x17aa, 0x2085, "Lenovo NB0763", ALC883_LENOVO_NB0763),
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 61996a2f45df..ce30b459aee6 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -3851,6 +3851,15 @@ static void stac_gpio_set(struct hda_codec *codec, unsigned int mask,
                            AC_VERB_SET_GPIO_DATA, gpiostate); /* sync */
 }
 
+#ifdef CONFIG_SND_JACK
+static void stac92xx_free_jack_priv(struct snd_jack *jack)
+{
+        struct sigmatel_jack *jacks = jack->private_data;
+        jacks->nid = 0;
+        jacks->jack = NULL;
+}
+#endif
+
 static int stac92xx_add_jack(struct hda_codec *codec,
                 hda_nid_t nid, int type)
 {
@@ -3860,6 +3869,7 @@ static int stac92xx_add_jack(struct hda_codec *codec,
         int def_conf = snd_hda_codec_get_pincfg(codec, nid);
         int connectivity = get_defcfg_connect(def_conf);
         char name[32];
+        int err;
 
         if (connectivity && connectivity != AC_JACK_PORT_FIXED)
                 return 0;
@@ -3876,10 +3886,15 @@ static int stac92xx_add_jack(struct hda_codec *codec,
                 snd_hda_get_jack_connectivity(def_conf),
                 snd_hda_get_jack_location(def_conf));
 
-        return snd_jack_new(codec->bus->card, name, type, &jack->jack);
-#else
-        return 0;
+        err = snd_jack_new(codec->bus->card, name, type, &jack->jack);
+        if (err < 0) {
+                jack->nid = 0;
+                return err;
+        }
+        jack->jack->private_data = jack;
+        jack->jack->private_free = stac92xx_free_jack_priv;
 #endif
+        return 0;
 }
 
 static int stac_add_event(struct sigmatel_spec *spec, hda_nid_t nid,
@@ -4138,8 +4153,10 @@ static void stac92xx_free_jacks(struct hda_codec *codec)
         if (!codec->bus->shutdown && spec->jacks.list) {
                 struct sigmatel_jack *jacks = spec->jacks.list;
                 int i;
-                for (i = 0; i < spec->jacks.used; i++)
-                        snd_device_free(codec->bus->card, &jacks[i].jack);
+                for (i = 0; i < spec->jacks.used; i++, jacks++) {
+                        if (jacks->jack)
+                                snd_device_free(codec->bus->card, jacks->jack);
+                }
         }
         snd_array_free(&spec->jacks);
 #endif