[alsa-devel] [PATCH 1/3] ASoC: ac97: don't call snd_soc_new_ac97_codec at probe

Mika Westerberg mika.westerberg at iki.fi
Wed Oct 13 10:30:31 CEST 2010


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 at iki.fi>
---
 sound/soc/codecs/ac97.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c
index 2c824a5..f5139ae 100644
--- a/sound/soc/codecs/ac97.c
+++ b/sound/soc/codecs/ac97.c
@@ -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)
-- 
1.5.6.5



More information about the Alsa-devel mailing list