diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2021-01-18 17:39:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-01-18 17:39:23 +0100 |
| commit | c09e28cd1219fd267ed838e1758ff2e7b6ff3ec6 (patch) | |
| tree | 6259cbb1e1659b2720934409c67e00180ee68ba4 /sound/usb/card.c | |
| parent | ALSA: x86: Simplify with dma_set_mask_and_coherent() (diff) | |
| parent | ALSA: usb-audio: Avoid implicit feedback on Pioneer devices (diff) | |
| download | linux-dev-c09e28cd1219fd267ed838e1758ff2e7b6ff3ec6.tar.xz linux-dev-c09e28cd1219fd267ed838e1758ff2e7b6ff3ec6.zip | |
Merge branch 'for-linus' into for-next
Back-merge of 5.11 devel branch for more works on USB-audio.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/card.c')
| -rw-r--r-- | sound/usb/card.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 45407cb81b66..85ed8507e41a 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -450,10 +450,8 @@ lookup_device_name(u32 id) static void snd_usb_audio_free(struct snd_card *card) { struct snd_usb_audio *chip = card->private_data; - struct snd_usb_endpoint *ep, *n; - list_for_each_entry_safe(ep, n, &chip->ep_list, list) - snd_usb_endpoint_free(ep); + snd_usb_endpoint_free_all(chip); mutex_destroy(&chip->mutex); if (!atomic_read(&chip->shutdown)) @@ -610,6 +608,7 @@ static int snd_usb_audio_create(struct usb_interface *intf, chip->usb_id = usb_id; INIT_LIST_HEAD(&chip->pcm_list); INIT_LIST_HEAD(&chip->ep_list); + INIT_LIST_HEAD(&chip->iface_ref_list); INIT_LIST_HEAD(&chip->midi_list); INIT_LIST_HEAD(&chip->mixer_list); |