Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block

[~andy/linux] / sound / soc / mxs / mxs-sgtl5000.c

diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c
index 3e6e8764b2e67674ad9ba3f571cd162a13cad509..215113b05f7d07c6ec46ecb591ec69bd04c5c610 100644 (file)
--- a/sound/soc/mxs/mxs-sgtl5000.c
+++ b/sound/soc/mxs/mxs-sgtl5000.c
@@ -133,7 +133,7 @@ static int __devinit mxs_sgtl5000_probe_dt(struct platform_device *pdev)
                mxs_sgtl5000_dai[i].codec_name = NULL;
                mxs_sgtl5000_dai[i].codec_of_node = codec_np;
                mxs_sgtl5000_dai[i].cpu_dai_name = NULL;
-               mxs_sgtl5000_dai[i].cpu_dai_of_node = saif_np[i];
+               mxs_sgtl5000_dai[i].cpu_of_node = saif_np[i];
                mxs_sgtl5000_dai[i].platform_name = NULL;
                mxs_sgtl5000_dai[i].platform_of_node = saif_np[i];
        }