Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / sound / core / init.c

diff --git a/sound/core/init.c b/sound/core/init.c
index a0080aa45ae968dfbcd9607fa39f7b587acc7c33..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) {