diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:57:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:57:07 +0100 |
| commit | 5dccf54e2b5e469f5577f3fe6ef95a279858d011 (patch) | |
| tree | 7ef9cff29f407bad3bc3cf86341ba52576fb7527 /sound/soc/fsl/imx-sgtl5000.c | |
| parent | 48539f73cb12bc22c6c071e0a9688656126d9a4c (diff) | |
| parent | fa659d830df0bad8fc3a3815a7f36bd8b7ed9254 (diff) | |
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Diffstat (limited to 'sound/soc/fsl/imx-sgtl5000.c')
| -rw-r--r-- | sound/soc/fsl/imx-sgtl5000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index 424347e9b2d7..9584e78858df 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -148,7 +148,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) data->dai.stream_name = "HiFi"; data->dai.codec_dai_name = "sgtl5000"; data->dai.codec_of_node = codec_np; - data->dai.cpu_dai_name = dev_name(&ssi_pdev->dev); + data->dai.cpu_of_node = ssi_np; data->dai.platform_name = "imx-pcm-audio"; data->dai.init = &imx_sgtl5000_dai_init; data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | |