On Wed, 2010-03-24 at 14:59 +1030, Graham Gower wrote:
> snd_soc_new_ac97_codec() allocates for codec->ac97, snd_soc_new_pcms()
> then sets the platform_data. However, snd_ac97_mixer() overwrites
> codec->ac97 with its own allocated struct snd_ac97.
>
> Signed-off-by: Graham Gower <graham.gower@xxxxxxxxx>
> ---
> sound/soc/codecs/ac97.c | 12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c
> index a1bbe16..64ec797 100644
> --- a/sound/soc/codecs/ac97.c
> +++ b/sound/soc/codecs/ac97.c
> @@ -80,9 +80,11 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg,
> static int ac97_soc_probe(struct platform_device *pdev)
> {
> struct snd_soc_device *socdev = platform_get_drvdata(pdev);
> + struct snd_soc_card *card = socdev->card;
> struct snd_soc_codec *codec;
> struct snd_ac97_bus *ac97_bus;
> struct snd_ac97_template ac97_template;
> + int i;
> int ret = 0;
>
> printk(KERN_INFO "AC97 SoC Audio Codec %s\n", AC97_VERSION);
> @@ -118,11 +120,21 @@ static int ac97_soc_probe(struct platform_device *pdev)
> if (ret < 0)
> goto bus_err;
>
> + /* free the ac97 here so that we don't leak it in snd_ac97_mixer */
> + snd_soc_free_ac97_codec(codec);
> +
Can you try removing the call to snd_soc_new_ac97_codec() instead. I've
just had a quick look and the codec->ac97 is not used by any calls upto
this point except for snd_soc_new_pcms() adding the AC97 pdata (please
also add a check for valid codec->ac97 in snd_soc_new_pcms() before
setting pdata).
Sorry, I don't have any working AC97 hardware to test this myself today.
Thanks
Liam
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
