summaryrefslogtreecommitdiffstats
path: root/include/sound/core.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-24 00:35:45 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-24 00:35:45 +0100
commit65b3864b85485a91f70988e1a222e3935bce87e4 (patch)
tree425063aeaa3c22f3956cc4dc7fc3d8173e9bd172 /include/sound/core.h
parentMerge branch 'topic/quirk-cleanup' into for-linus (diff)
parentALSA: Clean up snd_monitor_file management (diff)
downloadlinux-65b3864b85485a91f70988e1a222e3935bce87e4.tar.xz
linux-65b3864b85485a91f70988e1a222e3935bce87e4.zip
Merge branch 'topic/ctl-list-cleanup' into for-linus
Diffstat (limited to 'include/sound/core.h')
-rw-r--r--include/sound/core.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/core.h b/include/sound/core.h
index 59491f22da94..3dea79829acc 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -97,9 +97,9 @@ struct snd_device {
struct snd_monitor_file {
struct file *file;
- struct snd_monitor_file *next;
const struct file_operations *disconnected_f_op;
- struct list_head shutdown_list;
+ struct list_head shutdown_list; /* still need to shutdown */
+ struct list_head list; /* link of monitor files */
};
/* main structure for soundcard */
@@ -134,7 +134,7 @@ struct snd_card {
struct snd_info_entry *proc_id; /* the card id */
struct proc_dir_entry *proc_root_link; /* number link to real id */
- struct snd_monitor_file *files; /* all files associated to this card */
+ struct list_head files_list; /* all files associated to this card */
struct snd_shutdown_f_ops *s_f_ops; /* file operations in the shutdown
state */
spinlock_t files_lock; /* lock the files for this card */