Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 263375
b: refs/heads/master
c: 178b279
h: refs/heads/master
i:
  263373: 49ea842
  263371: 0a849b5
  263367: 1a54f42
  263359: 67488ff
v: v3
  • Loading branch information
Julia Lawall authored and Mark Brown committed Aug 22, 2011
1 parent 38f5d4c commit 17e6b5c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 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: 5006b313283c56cfda498513b7091692bcd74433
refs/heads/master: 178b279b645a14ca8ea01e4ea818c88681a31b07
4 changes: 3 additions & 1 deletion trunk/sound/soc/fsl/p1022_ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,10 @@ static int get_dma_channel(struct device_node *ssi_np,
* dai->platform name should already point to an allocated buffer.
*/
ret = of_address_to_resource(dma_channel_np, 0, &res);
if (ret)
if (ret) {
of_node_put(dma_channel_np);
return ret;
}
snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%s",
(unsigned long long) res.start, dma_channel_np->name);

Expand Down

0 comments on commit 17e6b5c

Please sign in to comment.