Skip to content

ASoC: sdw_utils: return -EPROBE_DEFER if components are not registered yet #5788

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

Open
bardliao wants to merge 1 commit into
base: topic/sof-dev
Choose a base branch
from
+8 −2
Open

ASoC: sdw_utils: return -EPROBE_DEFER if components are not registered yet #5788

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions sound/soc/sdw_utils/soc_sdw_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1629,7 +1629,9 @@ const char *asoc_sdw_get_codec_name(struct device *dev,
__func__, component->name, dai_info->codec_name);
return devm_kstrdup(dev, component->name, GFP_KERNEL);
} else {
return devm_kstrdup(dev, dai_info->codec_name, GFP_KERNEL);
dev_dbg(dev, "%s component %s is not registered yet\n",
__func__, dai_info->codec_name);
return ERR_PTR(-EPROBE_DEFER);
Comment on lines +1632 to +1634
}
}

Expand Down Expand Up @@ -2021,7 +2023,9 @@ int asoc_sdw_parse_sdw_endpoints(struct snd_soc_card *card,
codec_info->auxs[j].codec_name);
soc_aux->dlc.name = component->name;
} else {
soc_aux->dlc.name = codec_info->auxs[j].codec_name;
dev_dbg(dev, "%s the aux component %s is not registered yet\n",
__func__, codec_info->auxs[j].codec_name);
return -EPROBE_DEFER;
}
soc_aux++;
}
Expand Down Expand Up @@ -2121,6 +2125,8 @@ int asoc_sdw_parse_sdw_endpoints(struct snd_soc_card *card,

codec_name = asoc_sdw_get_codec_name(dev, dai_info,
adr_link, i);
if (IS_ERR(codec_name))
return PTR_ERR(codec_name);
if (!codec_name)
return -ENOMEM;

Expand Down
Loading