aboutsummaryrefslogtreecommitdiff
path: root/sound/core/init.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-27 08:02:59 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-27 08:02:59 +0200
commitd1227e3fe0c63a258db855f4f1536b0b34cd8725 (patch)
treed1fba37609a1b357eeb1051d0a6709385dd3bf90 /sound/core/init.c
parent9477c58e3308f54a108a5d1eb9621830b329b0ca (diff)
parent78fa2c4d2465d014e67d3e12d948425856587251 (diff)
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/core/init.c')
-rw-r--r--sound/core/init.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/core/init.c b/sound/core/init.c
index 30ecad41403..2c041bb36ab 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;