mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
00976ad527
The sequencer core module doesn't call some destructors in the error path of the init code, which may leave some resources. This patch mainly fix these leaks by calling the destructors appropriately at alsa_seq_init(). Also the patch brings a few cleanups along with it, namely: - Expand the old "if ((err = xxx) < 0)" coding style - Get rid of empty seq_queue_init() and its caller - Change snd_seq_info_done() to void Last but not least, a couple of functions lose __exit annotation since they are called also in alsa_seq_init(). No functional changes but minor code cleanups. Signed-off-by: Takashi Iwai <tiwai@suse.de>
75 lines
2.1 KiB
C
75 lines
2.1 KiB
C
/*
|
|
* ALSA sequencer /proc interface
|
|
* Copyright (c) 1998 by Frank van de Pol <fvdpol@coil.demon.nl>
|
|
*
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/export.h>
|
|
#include <sound/core.h>
|
|
|
|
#include "seq_info.h"
|
|
#include "seq_clientmgr.h"
|
|
#include "seq_timer.h"
|
|
|
|
static struct snd_info_entry *queues_entry;
|
|
static struct snd_info_entry *clients_entry;
|
|
static struct snd_info_entry *timer_entry;
|
|
|
|
|
|
static struct snd_info_entry * __init
|
|
create_info_entry(char *name, void (*read)(struct snd_info_entry *,
|
|
struct snd_info_buffer *))
|
|
{
|
|
struct snd_info_entry *entry;
|
|
|
|
entry = snd_info_create_module_entry(THIS_MODULE, name, snd_seq_root);
|
|
if (entry == NULL)
|
|
return NULL;
|
|
entry->content = SNDRV_INFO_CONTENT_TEXT;
|
|
entry->c.text.read = read;
|
|
if (snd_info_register(entry) < 0) {
|
|
snd_info_free_entry(entry);
|
|
return NULL;
|
|
}
|
|
return entry;
|
|
}
|
|
|
|
void snd_seq_info_done(void)
|
|
{
|
|
snd_info_free_entry(queues_entry);
|
|
snd_info_free_entry(clients_entry);
|
|
snd_info_free_entry(timer_entry);
|
|
}
|
|
|
|
/* create all our /proc entries */
|
|
int __init snd_seq_info_init(void)
|
|
{
|
|
queues_entry = create_info_entry("queues",
|
|
snd_seq_info_queues_read);
|
|
clients_entry = create_info_entry("clients",
|
|
snd_seq_info_clients_read);
|
|
timer_entry = create_info_entry("timer", snd_seq_info_timer_read);
|
|
if (!queues_entry || !clients_entry || !timer_entry)
|
|
goto error;
|
|
return 0;
|
|
|
|
error:
|
|
snd_seq_info_done();
|
|
return -ENOMEM;
|
|
}
|