From: Roel Kluin <12o3l@tiscali.nl> Date: Fri, 22 Feb 2008 17:41:41 +0000 (+0100) Subject: [ALSA] soc - duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e5c21571361d951888c26c6ed1a21047e14b5e71;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git [ALSA] soc - duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe() In linus' git tree I found this problem. Is it also in the alsa tree? please confirm it's the right fix. The patch was not yet tested. Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Acked-by: Timur Tabi Signed-off-by: Mark Brown Signed-off-by: Takashi Iwai Signed-off-by: Linus Torvalds --- diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index f26c4b2e8b6e..a00aac7a71f1 100644 --- 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;