summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@iki.fi>2010-10-13 11:30:31 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-10-13 10:35:05 +0100
commit7750752a22cbf7760f0073d218c737f5a03bff4a (patch)
tree21d289204b7059561af5f887df70a86422248b4a
parent00545785d7e355b0b1b9fb820ec70cb2ae51b409 (diff)
downloadop-kernel-dev-7750752a22cbf7760f0073d218c737f5a03bff4a.zip
op-kernel-dev-7750752a22cbf7760f0073d218c737f5a03bff4a.tar.gz
ASoC: ac97: don't call snd_soc_new_ac97_codec at probe
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>
-rw-r--r--sound/soc/codecs/ac97.c6
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)
OpenPOWER on IntegriCloud