diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-09-16 08:29:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-16 08:29:04 +0200 |
| commit | 0308110615acb4b6409fe042caf22bb9fb075d85 (patch) | |
| tree | d129f11ebdbe49b21246a72e6ba52c50e81e8e7e /sound/soc/ep93xx/ep93xx-i2s.c | |
| parent | c731bc96ad641a5fa3d50a87b474652505507282 (diff) | |
| parent | 763437a9e7737535b2fc72175ad4974048769be6 (diff) | |
| download | op-kernel-dev-0308110615acb4b6409fe042caf22bb9fb075d85.zip op-kernel-dev-0308110615acb4b6409fe042caf22bb9fb075d85.tar.gz | |
Merge branch 'fix/misc' into topic/misc
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 56efa0c..099614e 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; |
