ASoC: dapm: Fix double prefix addition
PATCH 1/1 ASoC: dapm: Fix double prefix addition
The prefix for the codec driver can be used during dual identical codec usecases. However, dapm adds prefix twice for codec DAI widget in snd_soc_dapm_add_route API.
This change is to avoid double prefix addition for codec DAI widget and is needed while using identical dual codecs.
Signed-off-by Songhee Baek <[email protected]>
Signed-off-by Arun Shamanna Lakshmi <[email protected]>
--- sound/soc/soc-dapm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
sound/soc/soc-dapm.c +6 -5
@@ -2476,7 +2476,8 @@ err: }static int snd_soc_dapm_add_route (struct snd_soc_dapm_context *dapm, -const struct snd_soc_dapm_route *route) +const struct snd_soc_dapm_route *route, +unsigned int is_prefixed) {struct snd_soc_dapm_widget *wsource =NULL , *wsink =NULL , *w;struct snd_soc_dapm_widget *wtsource =NULL , *wtsink =NULL ;
@@ -2486,7 +2487,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,char prefixed_source[80 ];int ret; -if (dapm->codec && dapm->codec->name_prefix) { +if (dapm->codec && dapm->codec->name_prefix && !is_prefixed) {snprintf (prefixed_sink,sizeof (prefixed_sink),"%s %s" , dapm->codec->name_prefix, route->sink); sink = prefixed_sink;
@@ -2614,7 +2615,7 @@ int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,mutex_lock_nested (&dapm->card->dapm_mutex,SND_SOC_DAPM_CLASS_INIT );for (i =0 ; i < num; i++) { - r =snd_soc_dapm_add_route (dapm, route); + r =snd_soc_dapm_add_route (dapm, route, false);if (r <0 ) { dev_err(dapm->dev, "ASoC: Failed to add route %s -> %s -> %s\n", route->source,
@@ -3670,7 +3671,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) cpu_dai->codec->name, r.source, codec_dai->platform->name, r.sink); -snd_soc_dapm_add_route (&card->dapm, &r); +snd_soc_dapm_add_route (&card->dapm, &r, true); }/* connect BE DAI capture if widgets are valid */
@@ -3681,7 +3682,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) codec_dai->codec->name, r.source, cpu_dai->platform->name, r.sink); -snd_soc_dapm_add_route (&card->dapm, &r); +snd_soc_dapm_add_route (&card->dapm, &r, true); } }
Signature · 1 line
1.7.9.5
Mark Brown
maintainerQuoted 6 lines · Arun Shamanna Lakshmi
The prefix for the codec driver can be used during dual identical codec usecases. However, dapm adds prefix twice for codec DAI widget in
snd_soc_dapm_add_routeAPI.This change is to avoid double prefix addition for codec DAI widget and is needed while using identical dual codecs.
Well, it's just a cosmetic thing so it's not *needed* per se but anyway. Applied, thanks.