diff options
author | Roel Kluin <12o3l@tiscali.nl> | 2008-02-22 12:41:41 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-22 17:20:09 -0500 |
commit | e5c21571361d951888c26c6ed1a21047e14b5e71 (patch) | |
tree | d52b8a0545802459381406857d3931b582002afc /sound/soc | |
parent | 902b05c117c33c50075b21c293bf60958dedb92d (diff) |
[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 <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/fsl/mpc8610_hpcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
315 | machine_data->dai_format = SND_SOC_DAIFMT_LEFT_J; | 315 | machine_data->dai_format = SND_SOC_DAIFMT_LEFT_J; |
316 | machine_data->codec_clk_direction = SND_SOC_CLOCK_IN; | 316 | machine_data->codec_clk_direction = SND_SOC_CLOCK_IN; |
317 | machine_data->cpu_clk_direction = SND_SOC_CLOCK_OUT; | 317 | machine_data->cpu_clk_direction = SND_SOC_CLOCK_OUT; |
318 | } else if (strcasecmp(sprop, "rj-master") == 0) { | 318 | } else if (strcasecmp(sprop, "rj-slave") == 0) { |
319 | machine_data->dai_format = SND_SOC_DAIFMT_RIGHT_J; | 319 | machine_data->dai_format = SND_SOC_DAIFMT_RIGHT_J; |
320 | machine_data->codec_clk_direction = SND_SOC_CLOCK_OUT; | 320 | machine_data->codec_clk_direction = SND_SOC_CLOCK_OUT; |
321 | machine_data->cpu_clk_direction = SND_SOC_CLOCK_IN; | 321 | machine_data->cpu_clk_direction = SND_SOC_CLOCK_IN; |