diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-26 09:29:43 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-26 09:29:43 +0200 |
| commit | 26b9b559ed9ff3bef5642ef731748d28d894705f (patch) | |
| tree | 9145782f06f68f88c004828d5f85d8d772d1cde6 /sound/soc/fsl/p1022_ds.c | |
| parent | 468c5458856236cde6df1b0654d32bf6625349a5 (diff) | |
| parent | 18036b5866b5e407a28f444a80de186a5d7df767 (diff) | |
| download | linux-rt-26b9b559ed9ff3bef5642ef731748d28d894705f.tar.gz | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/fsl/p1022_ds.c')
| -rw-r--r-- | sound/soc/fsl/p1022_ds.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c index 8fa4d5f8eda1..fcb862eb0c73 100644 --- a/sound/soc/fsl/p1022_ds.c +++ b/sound/soc/fsl/p1022_ds.c @@ -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); |