diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-06-18 10:38:45 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-06-18 10:38:45 -0400 |
| commit | 8d42fda9ea9820d271a40f0bf7ed436647f2ddb9 (patch) | |
| tree | 146fda0a84f4fa931a5f47528fd41a9eb133597e /include | |
| parent | 6c0c9a3db486508801cb2ced923c188e828f51d3 (diff) | |
| parent | 883a1d49f0d77d30012f114b2e19fc141beb3e8e (diff) | |
Merge branch 'topic/core-vuln-fixes' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index eedda2cdfe57..1df3f2fe5350 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
| @@ -116,6 +116,8 @@ struct snd_card { | |||
| 116 | int user_ctl_count; /* count of all user controls */ | 116 | int user_ctl_count; /* count of all user controls */ |
| 117 | struct list_head controls; /* all controls for this card */ | 117 | struct list_head controls; /* all controls for this card */ |
| 118 | struct list_head ctl_files; /* active control files */ | 118 | struct list_head ctl_files; /* active control files */ |
| 119 | struct mutex user_ctl_lock; /* protects user controls against | ||
| 120 | concurrent access */ | ||
| 119 | 121 | ||
| 120 | struct snd_info_entry *proc_root; /* root for soundcard specific files */ | 122 | struct snd_info_entry *proc_root; /* root for soundcard specific files */ |
| 121 | struct snd_info_entry *proc_id; /* the card id */ | 123 | struct snd_info_entry *proc_id; /* the card id */ |