Re: [PATCH] ASoC: Augment existing card DAPM routes in snd_soc_of_parse_audio_routing

2014-12-04 Thread Mark Brown
On Thu, Nov 27, 2014 at 10:02:42PM +0100, Peter Rosin wrote: > From: Peter Rosin > > If a snd_soc_card has any DAPM routes when it calls > snd_soc_of_parse_audio_routing, those are clobbered without this change. Applied, thanks. signature.asc Description: Digital signature

RE: [PATCH] ASoC: Augment existing card DAPM routes in snd_soc_of_parse_audio_routing

2014-11-28 Thread Peter Rosin
Mark Brown wrote: > On Thu, Nov 27, 2014 at 10:02:42PM +0100, Peter Rosin wrote: > > > - routes = devm_kzalloc(card->dev, num_routes * sizeof(*routes), > > + old_routes = card->num_dapm_routes; > > + routes = devm_kzalloc(card->dev, > > + (old_routes + num_routes) * s

Re: [PATCH] ASoC: Augment existing card DAPM routes in snd_soc_of_parse_audio_routing

2014-11-28 Thread Mark Brown
On Thu, Nov 27, 2014 at 10:02:42PM +0100, Peter Rosin wrote: > - routes = devm_kzalloc(card->dev, num_routes * sizeof(*routes), > + old_routes = card->num_dapm_routes; > + routes = devm_kzalloc(card->dev, > + (old_routes + num_routes) * sizeof(*routes), >

[PATCH] ASoC: Augment existing card DAPM routes in snd_soc_of_parse_audio_routing

2014-11-27 Thread Peter Rosin
From: Peter Rosin If a snd_soc_card has any DAPM routes when it calls snd_soc_of_parse_audio_routing, those are clobbered without this change. Signed-off-by: Peter Rosin --- sound/soc/soc-core.c | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sound/soc/soc-