LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH][sound/soc/fsl/mpc8610_hpcd.c] duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe()
@ 2008-02-04 21:08 Roel Kluin
2008-02-04 23:11 ` [alsa-devel] " Mark Brown
0 siblings, 1 reply; 5+ messages in thread
From: Roel Kluin @ 2008-02-04 21:08 UTC (permalink / raw)
To: liam.girdwood, broonie; +Cc: alsa-devel, lkml
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) {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [alsa-devel] [PATCH][sound/soc/fsl/mpc8610_hpcd.c] duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe()
2008-02-04 21:08 [PATCH][sound/soc/fsl/mpc8610_hpcd.c] duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe() Roel Kluin
@ 2008-02-04 23:11 ` Mark Brown
2008-02-04 23:17 ` Timur Tabi
0 siblings, 1 reply; 5+ messages in thread
From: Mark Brown @ 2008-02-04 23:11 UTC (permalink / raw)
To: Roel Kluin, Timur Tabi; +Cc: liam.girdwood, alsa-devel, lkml
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) {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [alsa-devel] [PATCH][sound/soc/fsl/mpc8610_hpcd.c] duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe()
2008-02-04 23:11 ` [alsa-devel] " Mark Brown
@ 2008-02-04 23:17 ` Timur Tabi
2008-02-05 10:19 ` [PATCH] " Mark Brown
0 siblings, 1 reply; 5+ messages in thread
From: Timur Tabi @ 2008-02-04 23:17 UTC (permalink / raw)
To: Roel Kluin, Timur Tabi, liam.girdwood, alsa-devel, lkml
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe()
2008-02-04 23:17 ` Timur Tabi
@ 2008-02-05 10:19 ` Mark Brown
2008-02-06 7:27 ` [alsa-devel] " Takashi Iwai
0 siblings, 1 reply; 5+ messages in thread
From: Mark Brown @ 2008-02-05 10:19 UTC (permalink / raw)
To: Takashi Iwai
Cc: alsa-devel, linux-kernel, Liam Girdwood, Roel Kluin, 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [alsa-devel] [PATCH] duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe()
2008-02-05 10:19 ` [PATCH] " Mark Brown
@ 2008-02-06 7:27 ` Takashi Iwai
0 siblings, 0 replies; 5+ messages in thread
From: Takashi Iwai @ 2008-02-06 7:27 UTC (permalink / raw)
To: Mark Brown; +Cc: Liam Girdwood, alsa-devel, Roel Kluin, linux-kernel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-02-06 7:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-04 21:08 [PATCH][sound/soc/fsl/mpc8610_hpcd.c] duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe() Roel Kluin
2008-02-04 23:11 ` [alsa-devel] " Mark Brown
2008-02-04 23:17 ` Timur Tabi
2008-02-05 10:19 ` [PATCH] " Mark Brown
2008-02-06 7:27 ` [alsa-devel] " Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).