diff options
author | David S. Miller <davem@davemloft.net> | 2014-06-25 22:40:43 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-06-25 22:40:43 -0700 |
commit | 9b8d90b963dcc6d3f3f6a616b3547ea1c8b03525 (patch) | |
tree | bca8230897630ca6721bdd7b959142984afa256a /sound/core/init.c | |
parent | 644a918d20336a7deaa81f675c3c2f25bf3dafbb (diff) | |
parent | d7933ab727ed035bdf420d7381b831ba959cecc5 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'sound/core/init.c')
-rw-r--r-- | sound/core/init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 5ee83845c5de..7bdfd19e24a8 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -232,6 +232,7 @@ int snd_card_new(struct device *parent, int idx, const char *xid, INIT_LIST_HEAD(&card->devices); init_rwsem(&card->controls_rwsem); rwlock_init(&card->ctl_files_rwlock); + mutex_init(&card->user_ctl_lock); INIT_LIST_HEAD(&card->controls); INIT_LIST_HEAD(&card->ctl_files); spin_lock_init(&card->files_lock); |