diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-20 08:45:52 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-20 08:45:52 +0200 |
| commit | b566762a670cb651da2fc985feb3910c92e80427 (patch) | |
| tree | 3281d9676d5ae79b04014d846899e57e58ed9d54 /sound/core/seq/seq.c | |
| parent | e20095367325b1307f199fb0f193816209f12514 (diff) | |
| parent | d5129f33a0d155d69cb0652cfc87bbc4d132ca17 (diff) | |
| download | op-kernel-dev-b566762a670cb651da2fc985feb3910c92e80427.zip op-kernel-dev-b566762a670cb651da2fc985feb3910c92e80427.tar.gz | |
Merge branch 'topic/seq-autoload' into for-next
Diffstat (limited to 'sound/core/seq/seq.c')
| -rw-r--r-- | sound/core/seq/seq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/core/seq/seq.c b/sound/core/seq/seq.c index 7121105..7e0aabb 100644 --- a/sound/core/seq/seq.c +++ b/sound/core/seq/seq.c @@ -86,7 +86,6 @@ static int __init alsa_seq_init(void) { int err; - snd_seq_autoload_lock(); if ((err = client_init_data()) < 0) goto error; @@ -110,8 +109,8 @@ static int __init alsa_seq_init(void) if ((err = snd_seq_system_client_init()) < 0) goto error; + snd_seq_autoload_init(); error: - snd_seq_autoload_unlock(); return err; } @@ -131,6 +130,8 @@ static void __exit alsa_seq_exit(void) /* release event memory */ snd_sequencer_memory_done(); + + snd_seq_autoload_exit(); } module_init(alsa_seq_init) |
