| Message ID | 1418903548-20935-1-git-send-email-broonie@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e3b1e6a19e09877b91517dfe304a2b3f6b2138fc |
| Headers | show |
On Thu, Dec 18, 2014 at 11:52:28AM +0000, Mark Brown wrote: > This reverts commit f8781db8aeb18d (ASoC: dapm: Augment existing card > DAPM routes in snd_soc_of_parse_audio_routing) since it is broken for > deferred probing as it ends up storing data allocated with devm_ over > multiple instantiations of the device. > > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> > Signed-off-by: Mark Brown <broonie@kernel.org> > --- Thanks Mark - I'll add it for testing this evening. Please modify the Reported-by: line to: Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> please, thanks.
On Thu, Dec 18, 2014 at 06:02:58PM +0000, Russell King - ARM Linux wrote: > Thanks Mark - I'll add it for testing this evening. Please modify the > Reported-by: line to: > Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> > please, thanks. Done.
On Thu, Dec 18, 2014 at 06:08:12PM +0000, Mark Brown wrote: > On Thu, Dec 18, 2014 at 06:02:58PM +0000, Russell King - ARM Linux wrote: > > > Thanks Mark - I'll add it for testing this evening. Please modify the > > Reported-by: line to: > > > Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> > > > please, thanks. > > Done. Great news, the SDP4430 now boots again. Thanks for the fix, and Merry Christmas. Tested-by: Russell King <rmk+kernel@arm.linux.org.uk> omap-abe-twl6040 sound: ASoC: CODEC DAI twl6040-legacy not registered omap-abe-twl6040 sound: snd_soc_register_card() failed: -517 platform sound: Driver omap-abe-twl6040 requests probe deferral ... omap-abe-twl6040 sound: twl6040-legacy <-> 40132000.mcpdm mapping ok omap-abe-twl6040 sound: dmic-hifi <-> 4012e000.dmic mapping ok
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 935721062c21..d7595465cfbc 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3231,7 +3231,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, const char *propname) { struct device_node *np = card->dev->of_node; - int num_routes, old_routes; + int num_routes; struct snd_soc_dapm_route *routes; int i, ret; @@ -3249,9 +3249,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, return -EINVAL; } - old_routes = card->num_dapm_routes; - routes = devm_kzalloc(card->dev, - (old_routes + num_routes) * sizeof(*routes), + routes = devm_kzalloc(card->dev, num_routes * sizeof(*routes), GFP_KERNEL); if (!routes) { dev_err(card->dev, @@ -3259,11 +3257,9 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, return -EINVAL; } - memcpy(routes, card->dapm_routes, old_routes * sizeof(*routes)); - for (i = 0; i < num_routes; i++) { ret = of_property_read_string_index(np, propname, - 2 * i, &routes[old_routes + i].sink); + 2 * i, &routes[i].sink); if (ret) { dev_err(card->dev, "ASoC: Property '%s' index %d could not be read: %d\n", @@ -3271,7 +3267,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, return -EINVAL; } ret = of_property_read_string_index(np, propname, - (2 * i) + 1, &routes[old_routes + i].source); + (2 * i) + 1, &routes[i].source); if (ret) { dev_err(card->dev, "ASoC: Property '%s' index %d could not be read: %d\n", @@ -3280,7 +3276,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, } } - card->num_dapm_routes += num_routes; + card->num_dapm_routes = num_routes; card->dapm_routes = routes; return 0;
This reverts commit f8781db8aeb18d (ASoC: dapm: Augment existing card DAPM routes in snd_soc_of_parse_audio_routing) since it is broken for deferred probing as it ends up storing data allocated with devm_ over multiple instantiations of the device. Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/soc-core.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)