Re: [PATCH] sound/soc/pxa/zylonite.c: set .codec_dai_name in initializer

From: Eric Miao
Date: Sat Mar 26 2011 - 11:01:41 EST


On Fri, Mar 18, 2011 at 7:47 PM, Antonio Ospite
<ospite@xxxxxxxxxxxxxxxxx> wrote:
> Fix the initialization of .codec_dai_name in zylonite_dai initializer,
> do not mix it with the initialization of .codec_name which is set
> already a few lines above.
>
> Signed-off-by: Antonio Ospite <ospite@xxxxxxxxxxxxxxxxx>

Acked-by: Eric Miao <eric.y.miao@xxxxxxxxx>

> ---
>
> Hi,
>
> I didn't test that because I don't have the hardware, I just noticed it by
> reading the code from 2.6.38 and thought this may be the right fix.
>
> Is there any mechanism to spot out when the same field in a struct initializer
> is set more than once?
>
> Regards,
> Â Antonio Ospite
> Â http://ao2.it
>
> Âsound/soc/pxa/zylonite.c | Â Â6 +++---
> Â1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
> index 25bba10..5e96f7e 100644
> --- a/sound/soc/pxa/zylonite.c
> +++ b/sound/soc/pxa/zylonite.c
> @@ -167,7 +167,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
> Â Â Â Â.codec_name = "wm9713-codec",
> Â Â Â Â.platform_name = "pxa-pcm-audio",
> Â Â Â Â.cpu_dai_name = "pxa2xx-ac97",
> - Â Â Â .codec_name = "wm9713-hifi",
> + Â Â Â .codec_dai_name = "wm9713-hifi",
> Â Â Â Â.init = zylonite_wm9713_init,
> Â},
> Â{
> @@ -176,7 +176,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
> Â Â Â Â.codec_name = "wm9713-codec",
> Â Â Â Â.platform_name = "pxa-pcm-audio",
> Â Â Â Â.cpu_dai_name = "pxa2xx-ac97-aux",
> - Â Â Â .codec_name = "wm9713-aux",
> + Â Â Â .codec_dai_name = "wm9713-aux",
> Â},
> Â{
> Â Â Â Â.name = "WM9713 Voice",
> @@ -184,7 +184,7 @@ static struct snd_soc_dai_link zylonite_dai[] = {
> Â Â Â Â.codec_name = "wm9713-codec",
> Â Â Â Â.platform_name = "pxa-pcm-audio",
> Â Â Â Â.cpu_dai_name = "pxa-ssp-dai.2",
> - Â Â Â .codec_name = "wm9713-voice",
> + Â Â Â .codec_dai_name = "wm9713-voice",
> Â Â Â Â.ops = &zylonite_voice_ops,
> Â},
> Â};
> --
> 1.7.4.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/