[PATCH][sound/soc/fsl/mpc8610_hpcd.c] duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe()

[PATCH][sound/soc/fsl/mpc8610_hpcd.c] duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe()

[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.
--
duplicate test for "rj-master"

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
---
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index f26c4b2..a00aac7 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -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) {

Re: [alsa-devel] [PATCH][sound/soc/fsl/mpc8610_hpcd.c] duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe()

[Mark Brown]

On Mon, Feb 04, 2008 at 10:08:02PM +0100, Roel Kluin wrote:
> 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?

> --
> duplicate test for "rj-master"
> 
> Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
> ---
> diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
> index f26c4b2..a00aac7 100644
> --- a/sound/soc/fsl/mpc8610_hpcd.c
> +++ b/sound/soc/fsl/mpc8610_hpcd.c
> @@ -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) {

Re: [alsa-devel] [PATCH][sound/soc/fsl/mpc8610_hpcd.c] duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe()

[Timur Tabi]

Mark Brown wrote:
> On Mon, Feb 04, 2008 at 10:08:02PM +0100, Roel Kluin wrote:
>> 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.

> 
>> --
>> duplicate test for "rj-master"
>>
>> Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
>> ---
>> diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
>> index f26c4b2..a00aac7 100644
>> --- a/sound/soc/fsl/mpc8610_hpcd.c
>> +++ b/sound/soc/fsl/mpc8610_hpcd.c
>> @@ -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
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 


-- 
Timur Tabi
Linux kernel developer at Freescale

[PATCH] duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe()

[Mark Brown]

From: Roel Kluin <12o3l@tiscali.nl>

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>
---
Applied to the ASoC tree too.

 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 f26c4b2..a00aac7 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;
-- 
1.5.4

Re: [alsa-devel] [PATCH] duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe()

[Takashi Iwai]

At Tue,  5 Feb 2008 10:19:43 +0000,
Mark Brown wrote:
> 
> From: Roel Kluin <12o3l@tiscali.nl>
> 
> 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