---

yaml --- r: 120482 b: refs/heads/master c: b94d353 h: refs/heads/master v: v3
git-mirror · Nov 21, 2008 · 436e7a6 · 436e7a6
1 parent 1d88385
commit 436e7a6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0623536ca3e8fd7cb8b7468b0fd4d61d80f0b6ea
+refs/heads/master: b94d3539de59ec6481e38f83c455324fd3aeabc1
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/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/trunk/sound/pci/hda/hda_codec.h b/trunk/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/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/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++)
-Original file line number
+Diff line change
@@ Expand Up / @@ -617,6 +617,7 @@ struct hda_bus { @@
     	/* misc op flags */
     	unsigned int needs_damn_long_delay :1;
+    	unsigned int shutdown :1;	/* being unloaded */
     };
     /*
@@ Expand Down @@