diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-23 00:33:01 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-23 00:33:01 +0200 |
| commit | 09d930ae5198fbb67b86d3d058ad82211f469a46 (patch) | |
| tree | e11f0be409e9184a0764263116a72dc0100aaaa8 /sound/soc/fsl/fsl_dma.c | |
| parent | ASoC: Allow idle_bias_off to be specified in CODEC drivers (diff) | |
| parent | sound/soc/fsl/mpc8610_hpcd.c: add missing of_node_put (diff) | |
| download | linux-09d930ae5198fbb67b86d3d058ad82211f469a46.tar.xz linux-09d930ae5198fbb67b86d3d058ad82211f469a46.zip | |
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) * 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; } |