* [PATCH] ASoC: Fix parameter for soc_unregister_ac97_dai_link
@ 2011-01-12 2:02 Axel Lin
2011-01-12 2:18 ` Mike Frysinger
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Axel Lin @ 2011-01-12 2:02 UTC (permalink / raw)
To: linux-kernel; +Cc: Mike Frysinger, Liam Girdwood, Mark Brown, stable
soc_unregister_ac97_dai_link takes a pointer to a codec.
Reported-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: stable@kernel.org [2.6.37]
---
sound/soc/soc-core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 85b7d54..e061ece 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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;
}
}
--
1.7.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: Fix parameter for soc_unregister_ac97_dai_link
2011-01-12 2:02 [PATCH] ASoC: Fix parameter for soc_unregister_ac97_dai_link Axel Lin
@ 2011-01-12 2:18 ` Mike Frysinger
2011-01-12 11:11 ` Liam Girdwood
2011-01-12 15:06 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2011-01-12 2:18 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Liam Girdwood, Mark Brown, stable
On Tue, Jan 11, 2011 at 21:02, Axel Lin wrote:
> soc_unregister_ac97_dai_link takes a pointer to a codec.
thanks ... seems to work for me
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: Fix parameter for soc_unregister_ac97_dai_link
2011-01-12 2:02 [PATCH] ASoC: Fix parameter for soc_unregister_ac97_dai_link Axel Lin
2011-01-12 2:18 ` Mike Frysinger
@ 2011-01-12 11:11 ` Liam Girdwood
2011-01-12 15:06 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Liam Girdwood @ 2011-01-12 11:11 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Mike Frysinger, Mark Brown, stable
On Wed, 2011-01-12 at 10:02 +0800, Axel Lin wrote:
> soc_unregister_ac97_dai_link takes a pointer to a codec.
>
> Reported-by: Mike Frysinger <vapier.adi@gmail.com>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> Cc: stable@kernel.org [2.6.37]
> ---
> sound/soc/soc-core.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> index 85b7d54..e061ece 100644
> --- a/sound/soc/soc-core.c
> +++ b/sound/soc/soc-core.c
> @@ -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 <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: Fix parameter for soc_unregister_ac97_dai_link
2011-01-12 2:02 [PATCH] ASoC: Fix parameter for soc_unregister_ac97_dai_link Axel Lin
2011-01-12 2:18 ` Mike Frysinger
2011-01-12 11:11 ` Liam Girdwood
@ 2011-01-12 15:06 ` Mark Brown
2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2011-01-12 15:06 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Mike Frysinger, Liam Girdwood, stable
On Wed, Jan 12, 2011 at 10:02:55AM +0800, Axel Lin wrote:
> soc_unregister_ac97_dai_link takes a pointer to a codec.
>
> Reported-by: Mike Frysinger <vapier.adi@gmail.com>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> Cc: stable@kernel.org [2.6.37]
This only applies in stable - it is a backport of 7d8316d (ASoC: Fix
AC'97 registration unwind) which should be going in during the merge
window.
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-01-12 15:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-12 2:02 [PATCH] ASoC: Fix parameter for soc_unregister_ac97_dai_link Axel Lin
2011-01-12 2:18 ` Mike Frysinger
2011-01-12 11:11 ` Liam Girdwood
2011-01-12 15:06 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox