Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[sfrench/cifs-2.6.git] / sound / soc / fsl / mpc8610_hpcd.c

diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index f26c4b2e8b6e7c11a93e7a855b5b0328910987a5..a00aac7a71f1c10e88b681e4867647bf96d9c328 100644 (file)
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -315,7 +315,7 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
                machine_data->dai_format = SND_SOC_DAIFMT_LEFT_J;
                machine_data->codec_clk_direction = SND_SOC_CLOCK_IN;
                machine_data->cpu_clk_direction = SND_SOC_CLOCK_OUT;
-       } else if (strcasecmp(sprop, "rj-master") == 0) {
+       } else if (strcasecmp(sprop, "rj-slave") == 0) {
                machine_data->dai_format = SND_SOC_DAIFMT_RIGHT_J;
                machine_data->codec_clk_direction = SND_SOC_CLOCK_OUT;
                machine_data->cpu_clk_direction = SND_SOC_CLOCK_IN;