Skip to content
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.

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

[SQUASHME]ASoC: SOF: fix return value for sof_link_load #58

Merged
merged 1 commit into from
Jul 30, 2018
Merged
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions sound/soc/sof/topology.c
Original file line number Diff line number Diff line change
Expand Up @@ -1743,13 +1743,20 @@ static int sof_link_load(struct snd_soc_component *scomp, int index,
ret = -EINVAL;
break;
}
if (ret < 0)
return ret;

dai = snd_sof_find_dai(sdev, (char *)link->name);
if (dai)
if (dai) {
/* set config for dai */
memcpy(&dai->dai_config, &config,
sizeof(struct sof_ipc_dai_config));
return 0;
}

return 0;
dev_err(sdev->dev, "failed to find BE DAI for link %s\n", link->name);

return -EINVAL;
}

static int sof_link_unload(struct snd_soc_component *scomp,
Expand Down