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

Commit 202728d7 authored by Adrian Bunk's avatar Adrian Bunk Committed by Jaroslav Kysela
Browse files

[ALSA] fix some memory leaks 



Modules: Generic drivers,ES18xx driver,CS46xx driver

This patch fixes two memory leaks spotted by the Coverity checker.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3e964432

sound/drivers/serial-u16550.c

+1 −0
Original line number Diff line number Diff line
@@ -789,6 +789,7 @@ static int __init snd_uart16550_create(struct snd_card *card, 


	if ((err = snd_uart16550_detect(uart)) <= 0) {

		printk(KERN_ERR "no UART detected at 0x%lx\n", iobase);

		snd_uart16550_free(uart);

		return -ENODEV;

	}

sound/isa/es18xx.c

+1 −0
Original line number Diff line number Diff line
@@ -2083,6 +2083,7 @@ static int __devinit snd_audiodrive_pnp(int dev, struct snd_audiodrive *acard, 
	err = pnp_activate_dev(acard->devc);

	if (err < 0) {

		snd_printk(KERN_ERR PFX "PnP control configure failure (out of resources?)\n");

		kfree(cfg);

		return -EAGAIN;

	}

	snd_printdd("pnp: port=0x%lx\n", pnp_port_start(acard->devc, 0));

sound/pci/cs46xx/dsp_spos.c

+7 −3
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip) 


	if (ins->symbol_table.symbols == NULL) {

		cs46xx_dsp_spos_destroy(chip);

		return NULL;

		goto error;

	}



	ins->code.offset = 0;
@@ -246,7 +246,7 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip) 


	if (ins->code.data == NULL) {

		cs46xx_dsp_spos_destroy(chip);

		return NULL;

		goto error;

	}



	ins->nscb = 0;
@@ -257,7 +257,7 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip) 


	if (ins->modules == NULL) {

		cs46xx_dsp_spos_destroy(chip);

		return NULL;

		goto error;

	}



	/* default SPDIF input sample rate
@@ -280,6 +280,10 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip) 
	 /* left and right validity bits */ (1 << 13) | (1 << 12);



	return ins;



error:

	kfree(ins);

	return NULL;

}



void  cs46xx_dsp_spos_destroy (struct snd_cs46xx * chip)