Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ALSA] fix some memory leaks

Browse Source 
Modules: Generic drivers,ES18xx driver,CS46xx driver

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

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Adrian Bunk 2006-03-14 09:44:19 +01:00 committed by Jaroslav Kysela
parent 3e964432f5
commit 202728d783
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/drivers/serial-u16550.c
View File

@ -789,6 +789,7 @@ static int __init snd_uart16550_create(struct snd_card *card,
if ((err = snd_uart16550_detect(uart)) <= 0) { if ((err = snd_uart16550_detect(uart)) <= 0) {
printk(KERN_ERR "no UART detected at 0x%lx\n", iobase); printk(KERN_ERR "no UART detected at 0x%lx\n", iobase);
snd_uart16550_free(uart);
return -ENODEV; return -ENODEV;
} }

1
sound/isa/es18xx.c
View File

@ -2083,6 +2083,7 @@ static int __devinit snd_audiodrive_pnp(int dev, struct snd_audiodrive *acard,
err = pnp_activate_dev(acard->devc); err = pnp_activate_dev(acard->devc);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR PFX "PnP control configure failure (out of resources?)\n"); snd_printk(KERN_ERR PFX "PnP control configure failure (out of resources?)\n");
kfree(cfg);
return -EAGAIN; return -EAGAIN;
} }
snd_printdd("pnp: port=0x%lx\n", pnp_port_start(acard->devc, 0)); snd_printdd("pnp: port=0x%lx\n", pnp_port_start(acard->devc, 0));

10
sound/pci/cs46xx/dsp_spos.c
View File

@ -237,7 +237,7 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip)
if (ins->symbol_table.symbols == NULL) { if (ins->symbol_table.symbols == NULL) {
cs46xx_dsp_spos_destroy(chip); cs46xx_dsp_spos_destroy(chip);
return NULL; goto error;
} }
ins->code.offset = 0; 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) { if (ins->code.data == NULL) {
cs46xx_dsp_spos_destroy(chip); cs46xx_dsp_spos_destroy(chip);
return NULL; goto error;
} }
ins->nscb = 0; ins->nscb = 0;
@ -257,7 +257,7 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip)
if (ins->modules == NULL) { if (ins->modules == NULL) {
cs46xx_dsp_spos_destroy(chip); cs46xx_dsp_spos_destroy(chip);
return NULL; goto error;
} }
/* default SPDIF input sample rate /* 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); /* left and right validity bits */ (1 << 13) | (1 << 12);
return ins; return ins;
error:
kfree(ins);
return NULL;
} }
void cs46xx_dsp_spos_destroy (struct snd_cs46xx * chip) void cs46xx_dsp_spos_destroy (struct snd_cs46xx * chip)