Skip to content

Upstream: unregister dai#540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ranj063 wants to merge 2 commits into from
Closed

Upstream: unregister dai #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
589e664
Revert "soc: fix a use after free case"
ranj063 Jan 14, 2019
7dca476
ASoC: core: Add snd_soc_unregister_dai()
ranj063 Jan 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/sound/soc.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1520,6 +1520,8 @@ struct snd_soc_dai_link *snd_soc_find_dai_link(struct snd_soc_card *card,

int snd_soc_register_dai(struct snd_soc_component *component,
struct snd_soc_dai_driver *dai_drv);
void snd_soc_unregister_dai(struct snd_soc_component *component,
struct snd_soc_dai_driver *dai_drv);

struct snd_soc_dai *snd_soc_find_dai(
const struct snd_soc_dai_link_component *dlc);
Expand Down
25 changes: 24 additions & 1 deletion sound/soc/soc-core.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -951,7 +951,7 @@ static void soc_remove_dai(struct snd_soc_dai *dai, int order)
{
int err;

if (!dai || !dai->probed || !dai->driver ||
if (!dai || !dai->probed ||
dai->driver->remove_order != order)
return;

Expand DownExpand Up@@ -2874,6 +2874,29 @@ static inline char *fmt_multiple_name(struct device *dev,
return kstrdup(dai_drv->name, GFP_KERNEL);
}

/**
* snd_soc_unregister_dai - Unregister DAI from the ASoC core
*
* @component: The component for which the DAI should be unregistered
* @dai_drv: the dai driver for the DAI
*/
void snd_soc_unregister_dai(struct snd_soc_component *component,
struct snd_soc_dai_driver *dai_drv)
{
struct snd_soc_dai *dai, *_dai;

for_each_component_dais_safe(component, dai, _dai) {
if (dai->driver == dai_drv) {
dev_dbg(component->dev, "ASoC: Unregistered DAI '%s'\n",
dai->name);
list_del(&dai->list);
kfree(dai->name);
kfree(dai);
return;

@plbossartplbossartJan 14, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks similar to snd_soc_unregister_dais(), except that you return here. would there be any merits in letting the loop continue?
Also the core is now quite confusing with (un)register_dais() and (un)register_dai() that are serve different purposes.

@ranj063ranj063Jan 14, 2019

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plbossart the main difference between unregister_dai() and unregister_dais() is the check to see if the dai->drv matches the input argument dai_drv. I could let the loop run, but I dont think there will be more than one dai with the same dai_drv.

}
}
}

/**
* snd_soc_unregister_dai - Unregister DAIs from the ASoC core
*
Expand Down
6 changes: 1 addition & 5 deletions sound/soc/soc-topology.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -520,18 +520,14 @@ static void remove_dai(struct snd_soc_component *comp,
{
struct snd_soc_dai_driver *dai_drv =
container_of(dobj, struct snd_soc_dai_driver, dobj);
struct snd_soc_dai *dai;

if (pass != SOC_TPLG_PASS_PCM_DAI)
return;

if (dobj->ops && dobj->ops->dai_unload)
dobj->ops->dai_unload(comp, dobj);

list_for_each_entry(dai, &comp->dai_list, list)
if (dai->driver == dai_drv)
dai->driver = NULL;

snd_soc_unregister_dai(comp, dai_drv);
kfree(dai_drv->name);
list_del(&dobj->list);
kfree(dai_drv);
Expand Down