summaryrefslogtreecommitdiff
path: root/sound/soc/fsl/fsl_dma.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-09-14 23:02:28 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-09-14 23:02:28 (GMT)
commit1db3706b05b11abcf2673ffbed5ad43b4c90ed11 (patch)
tree09fa867d9d9db6ed475eaa889da143603441e1a6 /sound/soc/fsl/fsl_dma.c
parentad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (diff)
parent63d15148b6058ab0037343390e8918503ed81968 (diff)
downloadlinux-fsl-qoriq-1db3706b05b11abcf2673ffbed5ad43b4c90ed11.tar.xz
Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'sound/soc/fsl/fsl_dma.c')
-rw-r--r--sound/soc/fsl/fsl_dma.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 732208c..cb50598 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -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;
}