diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-22 18:33:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-22 18:33:01 -0400 |
commit | 09d930ae5198fbb67b86d3d058ad82211f469a46 (patch) | |
tree | e11f0be409e9184a0764263116a72dc0100aaaa8 /sound/soc/fsl/fsl_dma.c | |
parent | 33c5f969b969c277e96cd9e9bf8472c4b8709c25 (diff) | |
parent | c09f5ca7bdc9a82c5f721bc28c46d65452240cfa (diff) |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/fsl/fsl_dma.c')
-rw-r--r-- | sound/soc/fsl/fsl_dma.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c index 0efc04af8f15..ef15402a3bc4 100644 --- a/sound/soc/fsl/fsl_dma.c +++ b/sound/soc/fsl/fsl_dma.c | |||
@@ -878,10 +878,12 @@ static struct device_node *find_ssi_node(struct device_node *dma_channel_np) | |||
878 | * assume that device_node pointers are a valid comparison. | 878 | * assume that device_node pointers are a valid comparison. |
879 | */ | 879 | */ |
880 | np = of_parse_phandle(ssi_np, "fsl,playback-dma", 0); | 880 | np = of_parse_phandle(ssi_np, "fsl,playback-dma", 0); |
881 | of_node_put(np); | ||
881 | if (np == dma_channel_np) | 882 | if (np == dma_channel_np) |
882 | return ssi_np; | 883 | return ssi_np; |
883 | 884 | ||
884 | np = of_parse_phandle(ssi_np, "fsl,capture-dma", 0); | 885 | np = of_parse_phandle(ssi_np, "fsl,capture-dma", 0); |
886 | of_node_put(np); | ||
885 | if (np == dma_channel_np) | 887 | if (np == dma_channel_np) |
886 | return ssi_np; | 888 | return ssi_np; |
887 | } | 889 | } |