Merge branch 'for-next' into for-linus

4.18-rc1 merge material.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 9 insertions, 0 deletions

diff --git a/sound/core/device.c b/sound/core/device.c
index cb0e46f66cc9..535102d564e3 100644
--- a/sound/core/device.c
+++ b/sound/core/device.c
@@ -240,6 +240,15 @@ void snd_device_free_all(struct snd_card *card)
 
         if (snd_BUG_ON(!card))
                 return;
+        list_for_each_entry_safe_reverse(dev, next, &card->devices, list) {
+                /* exception: free ctl and lowlevel stuff later */
+                if (dev->type == SNDRV_DEV_CONTROL ||
+                    dev->type == SNDRV_DEV_LOWLEVEL)
+                        continue;
+                __snd_device_free(dev);
+        }
+
+        /* free all */
         list_for_each_entry_safe_reverse(dev, next, &card->devices, list)
                 __snd_device_free(dev);
 }