ASoC: ac97: don't call snd_soc_new_ac97_codec at probe
authorMika Westerberg <mika.westerberg@iki.fi>
Wed, 13 Oct 2010 08:30:31 +0000 (11:30 +0300)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 13 Oct 2010 09:35:05 +0000 (10:35 +0100)
It is not needed since snd_ac97_mixer() will create a new ac97 object for us.
Removing the call also fixes a memory leak since codec->ac97 is set to NULL at
the beginning of snd_ac97_mixer().

Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/ac97.c

index 2c824a58875628ddf7542ee353620c4d886b5712..f5139ae51d8275b7643138c82b765c9af9adf9f5 100644 (file)
@@ -79,12 +79,6 @@ static int ac97_soc_probe(struct snd_soc_codec *codec)
        struct snd_ac97_template ac97_template;
        int ret;
 
-       ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
-       if (ret < 0) {
-               printk(KERN_ERR "ASoC: failed to init generic ac97 glue\n");
-               return ret;
-       }
-
        /* add codec as bus device for standard ac97 */
        ret = snd_ac97_bus(codec->card->snd_card, 0, &soc_ac97_ops, NULL, &ac97_bus);
        if (ret < 0)