leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: Remove name_prefix unset during DAI link init hack again

Browse Source 
This was initially removed in commit 6479f15ad ("ASoC: Remove name_prefix unset
during DAI link init hack"), but was brought back in commit 503ae5e0 ("ASoC:
core: Add helpers for dai link and aux dev init") by accident. This patch
removes it again.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Lars-Peter Clausen 2014-04-26 13:02:29 +02:00 committed by Mark Brown
parent 3701861060
commit 7b4a469e58
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/soc-core.c
View File

@ -1274,14 +1274,10 @@ static int soc_aux_dev_init(struct snd_soc_card *card,
{
struct snd_soc_aux_dev *aux_dev = &card->aux_dev[num];
struct snd_soc_pcm_runtime *rtd = &card->rtd_aux[num];
const char *temp;
int ret;
rtd->card = card;
temp = codec->name_prefix;
codec->name_prefix = NULL;
/* do machine specific initialization */
if (aux_dev->init) {
ret = aux_dev->init(&codec->dapm);
@ -1289,8 +1285,6 @@ static int soc_aux_dev_init(struct snd_soc_card *card,
return ret;
}
codec->name_prefix = temp;
rtd->codec = codec;
return 0;
@ -1302,15 +1296,10 @@ static int soc_dai_link_init(struct snd_soc_card *card,
{
struct snd_soc_dai_link *dai_link = &card->dai_link[num];
struct snd_soc_pcm_runtime *rtd = &card->rtd[num];
const char *temp;
int ret;
rtd->card = card;
/* machine controls, routes and widgets are not prefixed */
temp = codec->name_prefix;
codec->name_prefix = NULL;
/* do machine specific initialization */
if (dai_link->init) {
ret = dai_link->init(rtd);
@ -1318,8 +1307,6 @@ static int soc_dai_link_init(struct snd_soc_card *card,
return ret;
}
codec->name_prefix = temp;
rtd->codec = codec;
return 0;