3 files changed, 4 insertions, 1 deletions

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 5d5e8012d6a5..a98ce5b11188 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -464,6 +464,7 @@ static int snd_hda_bus_free(struct hda_bus *bus)
 static int snd_hda_bus_dev_free(struct snd_device *device)
 {
         struct hda_bus *bus = device->device_data;
+        bus->shutdown = 1;
         return snd_hda_bus_free(bus);
 }
 
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index ee122b009fd4..a70b181bbace 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -617,6 +617,7 @@ struct hda_bus {
 
         /* misc op flags */
         unsigned int needs_damn_long_delay :1;
+        unsigned int shutdown :1;       /* being unloaded */
 };
 
 /*
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index a501c9121649..4fa5189264b7 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -3921,8 +3921,9 @@ static int stac92xx_init(struct hda_codec *codec)
 static void stac92xx_free_jacks(struct hda_codec *codec)
 {
 #ifdef CONFIG_SND_JACK
+        /* free jack instances manually when clearing/reconfiguring */
         struct sigmatel_spec *spec = codec->spec;
-        if (spec->jacks.list) {
+        if (!codec->bus->shutdown && spec->jacks.list) {
                 struct sigmatel_jack *jacks = spec->jacks.list;
                 int i;
                 for (i = 0; i < spec->jacks.used; i++)