@@ -485,25 +485,6 @@ lookup_device_name(u32 id)
return NULL;
}
-/*
- * free the chip instance
- *
- * here we have to do not much, since pcm and controls are already freed
- *
- */
-
-static void snd_usb_audio_free(struct snd_card *card)
-{
- struct snd_usb_audio *chip = card->private_data;
-
- snd_usb_endpoint_free_all(chip);
- snd_usb_midi_v2_free_all(chip);
-
- mutex_destroy(&chip->mutex);
- if (!atomic_read(&chip->shutdown))
- dev_set_drvdata(&chip->dev->dev, NULL);
-}
-
static void usb_audio_make_shortname(struct usb_device *dev,
struct snd_usb_audio *chip,
const struct snd_usb_audio_quirk *quirk)
@@ -630,14 +611,17 @@ static int snd_usb_audio_create(struct usb_interface *intf,
return -ENXIO;
}
- err = snd_card_new(&intf->dev, index[idx], id[idx], THIS_MODULE,
- sizeof(*chip), &card);
+ chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+ if (!chip)
+ return -ENOMEM;
+
+ err = snd_card_new(&intf->dev, index[idx], id[idx], THIS_MODULE, 0, &card);
if (err < 0) {
dev_err(&dev->dev, "cannot create card instance %d\n", idx);
+ kfree(chip);
return err;
}
- chip = card->private_data;
mutex_init(&chip->mutex);
init_waitqueue_head(&chip->shutdown_wait);
chip->index = idx;
@@ -665,8 +649,6 @@ static int snd_usb_audio_create(struct usb_interface *intf,
else
snd_usb_init_quirk_flags(chip);
- card->private_free = snd_usb_audio_free;
-
strcpy(card->driver, "USB-Audio");
sprintf(component, "USB%04x:%04x",
USB_ID_VENDOR(chip->usb_id), USB_ID_PRODUCT(chip->usb_id));
@@ -755,6 +737,19 @@ get_alias_quirk(struct usb_device *dev, unsigned int id)
return NULL;
}
+static void snd_usb_chip_free(struct snd_usb_audio *chip)
+{
+ snd_usb_free_pcms(chip);
+ snd_usb_endpoint_free_all(chip);
+ snd_usb_midi_v2_free_all(chip);
+ /* mixers and midi1.0 freed with snd_card_free(). */
+
+ mutex_destroy(&chip->mutex);
+ if (!atomic_read(&chip->shutdown))
+ dev_set_drvdata(&chip->dev->dev, NULL);
+ kfree(chip);
+}
+
/* register card if we reach to the last interface or to the specified
* one given via option
*/
@@ -934,8 +929,10 @@ static int usb_audio_probe(struct usb_interface *intf,
* decrement before memory is possibly returned.
*/
atomic_dec(&chip->active);
- if (!chip->num_interfaces)
+ if (!chip->num_interfaces) {
snd_card_free(chip->card);
+ snd_usb_chip_free(chip);
+ }
}
mutex_unlock(®ister_mutex);
return err;
@@ -997,7 +994,8 @@ static void usb_audio_disconnect(struct usb_interface *intf)
if (chip->num_interfaces <= 0) {
usb_chip[chip->index] = NULL;
mutex_unlock(®ister_mutex);
- snd_card_free_when_closed(card);
+ snd_card_free(card);
+ snd_usb_chip_free(chip);
} else {
mutex_unlock(®ister_mutex);
}
@@ -55,7 +55,7 @@ static void free_substream(struct snd_usb_substream *subs)
/*
* free a usb stream instance
*/
-static void snd_usb_audio_stream_free(struct snd_usb_stream *stream)
+static void snd_usb_pcm_free(struct snd_usb_stream *stream)
{
free_substream(&stream->substream[0]);
free_substream(&stream->substream[1]);
@@ -63,13 +63,12 @@ static void snd_usb_audio_stream_free(struct snd_usb_stream *stream)
kfree(stream);
}
-static void snd_usb_audio_pcm_free(struct snd_pcm *pcm)
+void snd_usb_free_pcms(struct snd_usb_audio *chip)
{
- struct snd_usb_stream *stream = pcm->private_data;
- if (stream) {
- stream->pcm = NULL;
- snd_usb_audio_stream_free(stream);
- }
+ struct snd_usb_stream *as, *save;
+
+ list_for_each_entry_safe(as, save, &chip->pcm_list, list)
+ snd_usb_pcm_free(as);
}
/*
@@ -533,7 +532,6 @@ static int __snd_usb_add_audio_stream(struct snd_usb_audio *chip,
}
as->pcm = pcm;
pcm->private_data = as;
- pcm->private_free = snd_usb_audio_pcm_free;
pcm->info_flags = 0;
if (chip->pcm_devs > 0)
sprintf(pcm->name, "USB Audio #%d", chip->pcm_devs);
@@ -8,6 +8,7 @@ int snd_usb_parse_audio_interface(struct snd_usb_audio *chip,
int snd_usb_add_audio_stream(struct snd_usb_audio *chip,
int stream,
struct audioformat *fp);
+void snd_usb_free_pcms(struct snd_usb_audio *chip);
#endif /* __USBAUDIO_STREAM_H */
On ASoC side, drivers operate on instance of struct snd_soc_card instead of struct snd_card. The latter is owned by the ASoC framework. To make the existing sound/usb code ASoC-friendly and avoid freeing-order problems when soc_cleanup_card_resources() is called, resign from cardd->private_free() and extra-size when allocating new card with snd_card_new(). Similar pattern applies to PCMs. Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> --- sound/usb/card.c | 50 ++++++++++++++++++++++------------------------ sound/usb/stream.c | 14 ++++++------- sound/usb/stream.h | 1 + 3 files changed, 31 insertions(+), 34 deletions(-)