diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2011-08-26 09:29:43 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-26 09:29:43 +0200 |
| commit | 26b9b559ed9ff3bef5642ef731748d28d894705f (patch) | |
| tree | 9145782f06f68f88c004828d5f85d8d772d1cde6 /sound/soc/ep93xx/ep93xx-i2s.c | |
| parent | ALSA: hda: Conexant: Allow different output types to share DAC (diff) | |
| parent | ASoC: Correct element count for WM8996 sidetone HPF (diff) | |
| download | linux-dev-26b9b559ed9ff3bef5642ef731748d28d894705f.tar.xz linux-dev-26b9b559ed9ff3bef5642ef731748d28d894705f.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/ep93xx/ep93xx-i2s.c')
| -rw-r--r-- | sound/soc/ep93xx/ep93xx-i2s.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c index 56efa0c1c9a9..099614e16651 100644 --- a/sound/soc/ep93xx/ep93xx-i2s.c +++ b/sound/soc/ep93xx/ep93xx-i2s.c @@ -385,14 +385,14 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { err = -ENODEV; - goto fail; + goto fail_free_info; } info->mem = request_mem_region(res->start, resource_size(res), pdev->name); if (!info->mem) { err = -EBUSY; - goto fail; + goto fail_free_info; } info->regs = ioremap(info->mem->start, resource_size(info->mem)); @@ -435,6 +435,7 @@ fail_unmap_mem: iounmap(info->regs); fail_release_mem: release_mem_region(info->mem->start, resource_size(info->mem)); +fail_free_info: kfree(info); fail: return err; |