Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00976ad5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: seq: Fix leftovers at probe error path 



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: default avatarTakashi Iwai <tiwai@suse.de>
parent fc4bfd9a

sound/core/seq/seq.c

+16 −10
Original line number Diff line number Diff line
@@ -84,26 +84,32 @@ static int __init alsa_seq_init(void) 
{

	int err;



	if ((err = client_init_data()) < 0)

		goto error;



	/* init event queues */

	if ((err = snd_seq_queues_init()) < 0)

	err = client_init_data();

	if (err < 0)

		goto error;



	/* register sequencer device */

	if ((err = snd_sequencer_device_init()) < 0)

	err = snd_sequencer_device_init();

	if (err < 0)

		goto error;



	/* register proc interface */

	if ((err = snd_seq_info_init()) < 0)

		goto error;

	err = snd_seq_info_init();

	if (err < 0)

		goto error_device;



	/* register our internal client */

	if ((err = snd_seq_system_client_init()) < 0)

		goto error;

	err = snd_seq_system_client_init();

	if (err < 0)

		goto error_info;



	snd_seq_autoload_init();

	return 0;



 error_info:

	snd_seq_info_done();

 error_device:

	snd_sequencer_device_done();

 error:

	return err;

}

sound/core/seq/seq_clientmgr.c

+1 −1
Original line number Diff line number Diff line
@@ -2543,7 +2543,7 @@ int __init snd_sequencer_device_init(void) 
/* 

 * unregister sequencer device 

 */

void __exit snd_sequencer_device_done(void)

void snd_sequencer_device_done(void)

{

	snd_unregister_device(&seq_dev);

	put_device(&seq_dev);

sound/core/seq/seq_info.c

+2 −8
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ create_info_entry(char *name, void (*read)(struct snd_info_entry *, 
	return entry;

}



static void free_info_entries(void)

void snd_seq_info_done(void)

{

	snd_info_free_entry(queues_entry);

	snd_info_free_entry(clients_entry);
@@ -70,12 +70,6 @@ int __init snd_seq_info_init(void) 
	return 0;



 error:

	free_info_entries();

	snd_seq_info_done();

	return -ENOMEM;

}
 


int __exit snd_seq_info_done(void)

{

	free_info_entries();

	return 0;

}

sound/core/seq/seq_info.h

+3 −3
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ void snd_seq_info_queues_read(struct snd_info_entry *entry, struct snd_info_buff 


#ifdef CONFIG_SND_PROC_FS

int snd_seq_info_init(void);

int snd_seq_info_done( void );

void snd_seq_info_done(void);

#else

static inline int snd_seq_info_init(void) { return 0; }

static inline int snd_seq_info_done(void) { return 0; }

static inline void snd_seq_info_done(void) {}

#endif



#endif

sound/core/seq/seq_queue.c

+1 −11
Original line number Diff line number Diff line
@@ -159,18 +159,8 @@ static void queue_delete(struct snd_seq_queue *q) 


/*----------------------------------------------------------------*/



/* setup queues */

int __init snd_seq_queues_init(void)

{

	/*

	memset(queue_list, 0, sizeof(queue_list));

	num_queues = 0;

	*/

	return 0;

}



/* delete all existing queues */

void __exit snd_seq_queues_delete(void)

void snd_seq_queues_delete(void)

{

	int i;