diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 13:26:02 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 13:26:02 +0200 |
| commit | aa72f6899b9fb3dc824c458234ae3507a60e462d (patch) | |
| tree | 97480a3cefc3d864ffd6eb994ec09ab5d680eabe /sound/core/init.c | |
| parent | ASoC: Use a lower detection rate when monitoring headphones on WM8915 (diff) | |
| parent | Merge branch 'for-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... (diff) | |
| download | linux-aa72f6899b9fb3dc824c458234ae3507a60e462d.tar.xz linux-aa72f6899b9fb3dc824c458234ae3507a60e462d.zip | |
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound/core/init.c')
| -rw-r--r-- | sound/core/init.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index a0080aa45ae9..2c041bb36ab3 100644 --- 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) { |