Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 263374
b: refs/heads/master
c: 5006b31
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and Mark Brown committed Aug 22, 2011
1 parent 49ea842 commit 38f5d4c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 96101bd0bf7974686f6875c065a7a9a83cd2107a
refs/heads/master: 5006b313283c56cfda498513b7091692bcd74433
5 changes: 3 additions & 2 deletions trunk/sound/soc/ep93xx/ep93xx-i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -435,6 +435,7 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
iounmap(info->regs);
fail_release_mem:
release_mem_region(info->mem->start, resource_size(info->mem));
fail_free_info:
kfree(info);
fail:
return err;
Expand Down

0 comments on commit 38f5d4c

Please sign in to comment.