diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-12-15 00:25:52 +0100 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2006-12-15 00:25:52 +0100 |
| commit | e2cde31279a1e6c0d3b6dbb9a8987c3c017ba4c6 (patch) | |
| tree | cb1c0c851e3903efe768900ad8275abacb311142 /sound | |
| parent | 2b12669873c4e2a5b2f9d4ccc84653832b06c2ff (diff) | |
[ALSA] fix some memory leaks
This patch fixes two memory leaks spotted by the Coverity checker.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/isa/es18xx.c | 1 | ||||
| -rw-r--r-- | sound/pci/cs46xx/dsp_spos.c | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index 08f032b51107..7a12848a7b05 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c @@ -1927,6 +1927,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)); diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c index 445a448949e7..81bcae073bc0 100644 --- a/sound/pci/cs46xx/dsp_spos.c +++ b/sound/pci/cs46xx/dsp_spos.c @@ -235,7 +235,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; @@ -244,7 +244,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; @@ -255,7 +255,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 @@ -278,6 +278,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) |