Merge remote-tracking branch 'asoc/topic/core' into asoc-next
This commit is contained in:
commit
24ecc23cf6
|
@ -758,7 +758,6 @@ struct snd_soc_component {
|
|||
|
||||
unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */
|
||||
unsigned int registered_as_component:1;
|
||||
unsigned int probed:1;
|
||||
|
||||
struct list_head list;
|
||||
|
||||
|
|
|
@ -978,7 +978,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num)
|
|||
|
||||
static void soc_remove_component(struct snd_soc_component *component)
|
||||
{
|
||||
if (!component->probed)
|
||||
if (!component->card)
|
||||
return;
|
||||
|
||||
/* This is a HACK and will be removed soon */
|
||||
|
@ -991,7 +991,7 @@ static void soc_remove_component(struct snd_soc_component *component)
|
|||
snd_soc_dapm_free(snd_soc_component_get_dapm(component));
|
||||
|
||||
soc_cleanup_component_debugfs(component);
|
||||
component->probed = 0;
|
||||
component->card = NULL;
|
||||
module_put(component->dev->driver->owner);
|
||||
}
|
||||
|
||||
|
@ -1102,16 +1102,26 @@ static int soc_probe_component(struct snd_soc_card *card,
|
|||
struct snd_soc_dai *dai;
|
||||
int ret;
|
||||
|
||||
if (component->probed)
|
||||
if (!strcmp(component->name, "snd-soc-dummy"))
|
||||
return 0;
|
||||
|
||||
if (component->card) {
|
||||
if (component->card != card) {
|
||||
dev_err(component->dev,
|
||||
"Trying to bind component to card \"%s\" but is already bound to card \"%s\"\n",
|
||||
card->name, component->card->name);
|
||||
return -ENODEV;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!try_module_get(component->dev->driver->owner))
|
||||
return -ENODEV;
|
||||
|
||||
component->card = card;
|
||||
dapm->card = card;
|
||||
soc_set_name_prefix(card, component);
|
||||
|
||||
if (!try_module_get(component->dev->driver->owner))
|
||||
return -ENODEV;
|
||||
|
||||
soc_init_component_debugfs(component);
|
||||
|
||||
if (component->dapm_widgets) {
|
||||
|
@ -1155,7 +1165,6 @@ static int soc_probe_component(struct snd_soc_card *card,
|
|||
snd_soc_dapm_add_routes(dapm, component->dapm_routes,
|
||||
component->num_dapm_routes);
|
||||
|
||||
component->probed = 1;
|
||||
list_add(&dapm->list, &card->dapm_list);
|
||||
|
||||
/* This is a HACK and will be removed soon */
|
||||
|
@ -1166,6 +1175,7 @@ static int soc_probe_component(struct snd_soc_card *card,
|
|||
|
||||
err_probe:
|
||||
soc_cleanup_component_debugfs(component);
|
||||
component->card = NULL;
|
||||
module_put(component->dev->driver->owner);
|
||||
|
||||
return ret;
|
||||
|
@ -1449,7 +1459,7 @@ static void soc_remove_aux_dev(struct snd_soc_card *card, int num)
|
|||
rtd->dev_registered = 0;
|
||||
}
|
||||
|
||||
if (component && component->probed)
|
||||
if (component)
|
||||
soc_remove_component(component);
|
||||
}
|
||||
|
||||
|
|
|
@ -3821,11 +3821,6 @@ static void dapm_connect_dai_link_widgets(struct snd_soc_card *card,
|
|||
for (i = 0; i < rtd->num_codecs; i++) {
|
||||
struct snd_soc_dai *codec_dai = rtd->codec_dais[i];
|
||||
|
||||
/* there is no point in connecting BE DAI links with dummies */
|
||||
if (snd_soc_dai_is_dummy(codec_dai) ||
|
||||
snd_soc_dai_is_dummy(cpu_dai))
|
||||
continue;
|
||||
|
||||
/* connect BE DAI playback if widgets are valid */
|
||||
if (codec_dai->playback_widget && cpu_dai->playback_widget) {
|
||||
source = cpu_dai->playback_widget;
|
||||
|
|
Loading…
Reference in a new issue