Commit b94d3539 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Fix double free of jack instances

The jack instances created in patch_sigmatel.c may be double-freed.
The device management code checks the invalid element, and thus there
is no real breakage, but it spews annoying warning messages.
But, we can't simply remove the release calls of these jack instances
because they have to be freed when the codec is re-configured.

Now, a new flag, bus->shutdown is introduced to indicate that the bus
is really being unloaded, i.e. the objects managed by the device
manager will be automatically deleted.  We release these objects only
when this flag isn't set.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 0623536c
...@@ -464,6 +464,7 @@ static int snd_hda_bus_free(struct hda_bus *bus) ...@@ -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) static int snd_hda_bus_dev_free(struct snd_device *device)
{ {
struct hda_bus *bus = device->device_data; struct hda_bus *bus = device->device_data;
bus->shutdown = 1;
return snd_hda_bus_free(bus); return snd_hda_bus_free(bus);
} }
......
...@@ -617,6 +617,7 @@ struct hda_bus { ...@@ -617,6 +617,7 @@ struct hda_bus {
/* misc op flags */ /* misc op flags */
unsigned int needs_damn_long_delay :1; unsigned int needs_damn_long_delay :1;
unsigned int shutdown :1; /* being unloaded */
}; };
/* /*
......
...@@ -3921,8 +3921,9 @@ static int stac92xx_init(struct hda_codec *codec) ...@@ -3921,8 +3921,9 @@ static int stac92xx_init(struct hda_codec *codec)
static void stac92xx_free_jacks(struct hda_codec *codec) static void stac92xx_free_jacks(struct hda_codec *codec)
{ {
#ifdef CONFIG_SND_JACK #ifdef CONFIG_SND_JACK
/* free jack instances manually when clearing/reconfiguring */
struct sigmatel_spec *spec = codec->spec; struct sigmatel_spec *spec = codec->spec;
if (spec->jacks.list) { if (!codec->bus->shutdown && spec->jacks.list) {
struct sigmatel_jack *jacks = spec->jacks.list; struct sigmatel_jack *jacks = spec->jacks.list;
int i; int i;
for (i = 0; i < spec->jacks.used; i++) for (i = 0; i < spec->jacks.used; i++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment