Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 263371
b: refs/heads/master
c: 81a081f
h: refs/heads/master
i:
  263369: 7dee7cf
  263367: 1a54f42
v: v3
  • Loading branch information
Timur Tabi authored and Mark Brown committed Aug 22, 2011
1 parent 1bde6ef commit 0a849b5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a41619455c0e28b6973471e87f1702c6129d3439
refs/heads/master: 81a081fff7f3c144a0da9ee726906e533f66dd89
2 changes: 2 additions & 0 deletions trunk/sound/soc/fsl/fsl_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -879,10 +879,12 @@ static struct device_node *find_ssi_node(struct device_node *dma_channel_np)
* assume that device_node pointers are a valid comparison.
*/
np = of_parse_phandle(ssi_np, "fsl,playback-dma", 0);
of_node_put(np);
if (np == dma_channel_np)
return ssi_np;

np = of_parse_phandle(ssi_np, "fsl,capture-dma", 0);
of_node_put(np);
if (np == dma_channel_np)
return ssi_np;
}
Expand Down

0 comments on commit 0a849b5

Please sign in to comment.