duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe()
PATCH 1/1 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. --
duplicate test for "rj-master"
---
sound/soc/fsl/mpc8610_hpcd.c +1 -1
@@ -314,9 +314,9 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev, }else if (strcasecmp (sprop,"lj-master" ) ==0 ) { 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 ; }else if (strcasecmp (sprop,"rj-master" ) ==0 ) {
Quoted 2 lines · Roel Kluin
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.
Timur, this looks like a good catch?
Quoted 20 lines
--
duplicate test for "rj-master"Signed-off-by Roel Kluin <[email protected]>---
sound/soc/fsl/mpc8610_hpcd.c +1
-1@@ -314,9 +314,9 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev, }else if (strcasecmp (sprop,"lj-master" ) ==0 ) { 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 ; }else if (strcasecmp (sprop,"rj-master" ) ==0 ) {
Quoted 5 lines · Mark Brown
Quoted 2 lines · Roel Kluin
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.
Timur, this looks like a good catch?
Yes, thank you! The change below should be made.
Quoted 26 lines
Quoted 11 lines
--
duplicate test for "rj-master"Signed-off-by Roel Kluin <[email protected]>---
sound/soc/fsl/mpc8610_hpcd.c +0
-0sound/soc/fsl/mpc8610_hpcd.c static int mpc8610_hpcd_probe(struct of_device *ofdev, · line 322
Quoted 10 lines
sound/soc/fsl/mpc8610_hpcd.c +1
-1@@ -314,9 +314,9 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev, }else if (strcasecmp (sprop,"lj-master" ) ==0 ) { 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 ; }else if (strcasecmp (sprop,"rj-master" ) ==0 ) {_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
PATCH 1/1 duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe()
From: Roel Kluin <[email protected]>
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.
---
Applied to the ASoC tree too.
sound/soc/fsl/mpc8610_hpcd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/fsl/mpc8610_hpcd.c +1 -1
@@ -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 ;
Signature · 1 line
1.5.4
At Tue, 5 Feb 2008 10:19:43 +0000,
Quoted 5 lines · Mark Brown
From: Roel Kluin <[email protected]>
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.
Thanks, I applied it to ALSA tree now. Let me know if it's a wrong fix.
Takashi