diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-10 10:26:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-10 10:26:16 +0100 |
| commit | 915b2c750e4a0036afa0449f5d376b5b4e8717d8 (patch) | |
| tree | 5b5ae6df1c763ce09e25bfed76310b68258d62e3 /sound/soc/fsl/imx-sgtl5000.c | |
| parent | 2bdc1bb2b4e1f517d8aa5bbbad9cb6ccac8a94fb (diff) | |
| parent | dbdf6b54340e1671439a4a5efbd15b7a0b14eacb (diff) | |
Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sgtl5000
Diffstat (limited to 'sound/soc/fsl/imx-sgtl5000.c')
| -rw-r--r-- | sound/soc/fsl/imx-sgtl5000.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index 9584e78858df..a60aaa053d28 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -149,7 +149,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) data->dai.codec_dai_name = "sgtl5000"; data->dai.codec_of_node = codec_np; data->dai.cpu_of_node = ssi_np; - data->dai.platform_name = "imx-pcm-audio"; + data->dai.platform_of_node = ssi_np; data->dai.init = &imx_sgtl5000_dai_init; data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM; @@ -174,6 +174,11 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, data); + of_node_put(ssi_np); + of_node_put(codec_np); + + return 0; + clk_fail: clk_put(data->codec_clk); fail: |