diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-04-23 04:56:21 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-04-24 11:31:08 -0400 |
commit | a0dca822e923e605dbdc2f6ed4fcd96b74df9258 (patch) | |
tree | 667e4f97b560fa6570f99cc60312a72faca4c852 /sound/core/info.c | |
parent | 85d143180738475b89d76b18409c3125b01464e1 (diff) |
ALSA: core: Clean up OSS proc file management
A few minor cleanups:
- Move the call of snd_info_minor_register() into snd_info_init() so
that we can call all proc-related stuff in a shot
- Add missing __init prefix to snd_info_minor_register()
- Return an error properly from snd_oss_info_register()
- Drop snd_info_minor_unregister() that is superfluous now
Acked-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/info.c')
-rw-r--r-- | sound/core/info.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/info.c b/sound/core/info.c index f8bdd9b6f322..c8a413d6cc9b 100644 --- a/sound/core/info.c +++ b/sound/core/info.c | |||
@@ -479,7 +479,8 @@ int __init snd_info_init(void) | |||
479 | if (snd_info_version_init() < 0 || | 479 | if (snd_info_version_init() < 0 || |
480 | snd_minor_info_init() < 0 || | 480 | snd_minor_info_init() < 0 || |
481 | snd_minor_info_oss_init() < 0 || | 481 | snd_minor_info_oss_init() < 0 || |
482 | snd_card_info_init() < 0) | 482 | snd_card_info_init() < 0 || |
483 | snd_info_minor_register() < 0) | ||
483 | goto error; | 484 | goto error; |
484 | return 0; | 485 | return 0; |
485 | 486 | ||