Merge branch 'fix/asoc' into for-linus

[~andy/linux] / sound / core / init.c

diff --git a/sound/core/init.c b/sound/core/init.c
index 3e65da21a08c0398f78f5aa32da004dbe08a1c6d..2c041bb36ab3c177e032e16e39ee47777dce7f48 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -342,7 +342,6 @@ static const struct file_operations snd_shutdown_f_ops =
 int snd_card_disconnect(struct snd_card *card)
 {
        struct snd_monitor_file *mfile;
-       struct file *file;
        int err;
 
        if (!card)
@@ -366,8 +365,6 @@ int snd_card_disconnect(struct snd_card *card)
        
        spin_lock(&card->files_lock);
        list_for_each_entry(mfile, &card->files_list, list) {
-               file = mfile->file;
-
                /* it's critical part, use endless loop */
                /* we have no room to fail */
                mfile->disconnected_f_op = mfile->file->f_op;
@@ -514,7 +511,7 @@ static void snd_card_set_id_no_lock(struct snd_card *card, const char *nid)
        id = card->id;
        
        if (*id == '\0')
-               strcpy(id, "default");
+               strcpy(id, "Default");
 
        while (1) {
                if (loops-- == 0) {
@@ -848,6 +845,7 @@ int snd_card_file_add(struct snd_card *card, struct file *file)
                return -ENOMEM;
        mfile->file = file;
        mfile->disconnected_f_op = NULL;
+       INIT_LIST_HEAD(&mfile->shutdown_list);
        spin_lock(&card->files_lock);
        if (card->shutdown) {
                spin_unlock(&card->files_lock);
@@ -883,6 +881,9 @@ int snd_card_file_remove(struct snd_card *card, struct file *file)
        list_for_each_entry(mfile, &card->files_list, list) {
                if (mfile->file == file) {
                        list_del(&mfile->list);
+                       spin_lock(&shutdown_lock);
+                       list_del(&mfile->shutdown_list);
+                       spin_unlock(&shutdown_lock);
                        if (mfile->disconnected_f_op)
                                fops_put(mfile->disconnected_f_op);
                        found = mfile;