Skip to contentSkip to conversation

ASoC: Fix parameter for soc_unregister_ac97_dai_link

PATCH In review Axel Lin 4 participants 4 messages Jan 12, 2011

Subsystems (2)
Sound ASoC
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 ASoC: Fix parameter for soc_unregister_ac97_dai_link

soc_unregister_ac97_dai_link takes a pointer to a codec.

Reported-by Mike Frysinger <[email protected]>
Signed-off-by Axel Lin <[email protected]>
Cc [email protected] [2.6.37]
---
 sound/soc/soc-core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/soc-core.c +1 -1
index 85b7d54..e061ece 100644
@@ -1623,7 +1623,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
 		if (ret < 0) {
 			printk(KERN_ERR "asoc: failed to register AC97 %s\n", card->name);
 			while (--i >= 0)
-				soc_unregister_ac97_dai_link(&card->rtd[i]);
+				soc_unregister_ac97_dai_link(card->rtd[i].codec);
 			goto probe_dai_err;
 		}
 	}
Signature · 1 line
1.7.2
Acked-by on v1 1/1
#2 lore raw
In reply to Axel Lin
Quoted 14 lines · Axel Lin

soc_unregister_ac97_dai_link takes a pointer to a codec.

Reported-by Mike Frysinger <[email protected]>
Signed-off-by Axel Lin <[email protected]>
Cc [email protected] [2.6.37]
---
 sound/soc/soc-core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/soc-core.c +0 -0
index 85b7d54..e061ece 100644

sound/soc/soc-core.c static void snd_soc_instantiate_card(struct snd_soc_card *card) · line 1629

Quoted 8 lines
sound/soc/soc-core.c +1 -1
@@ -1623,7 +1623,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
 		if (ret < 0) {
 			printk(KERN_ERR "asoc: failed to register AC97 %s\n", card->name);
 			while (--i >= 0)
-				soc_unregister_ac97_dai_link(&card->rtd[i]);
+				soc_unregister_ac97_dai_link(card->rtd[i].codec);
 			goto probe_dai_err;
 		}
 	}
Acked-by Liam Girdwood <[email protected]>
Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk