ASoC: SOF: topology: Use partial match for disconnecting DAI link and DAI widget #4641
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
plbossart
previously approved these changes
Oct 17, 2023
|
one very odd faIlure for CML_SKU0955_HDA in https://sof-ci.01.org/linuxpr/PR4641/build414/devicetest/index.html Wow. |
ranj063
previously approved these changes
Oct 17, 2023
|
SOFCI TEST |
|
@bardliao GCC -fanalyzer found a fantastic bug in this PR list_for_each_entry(rtd, &card->rtd_list, list) {
/* does stream match DAI link ? */
if (!rtd->dai_link->stream_name ||
!strstr(rtd->dai_link->stream_name, w->sname)) <<< 2. in the next iteration w is dereferenced -> ooops
continue;
for_each_rtd_cpu_dais(rtd, i, cpu_dai)
if (snd_soc_dai_get_widget(cpu_dai, stream) == w) {
snd_soc_dai_set_widget(cpu_dai, stream, NULL); <<< 1. This sets w=NULL
break;
}
}suggested change: strstr(rtd->dai_link->stream_name, sname)would ignore changes to w - that's how the code was initially written btw. |
… DAI widget We use partial match for connecting DAI link and DAI widget. We need to use partial match for disconnecting, too. Fixes: fe88788 ("ASoC: SOF: topology: Use partial match for connecting DAI link and DAI widget") Signed-off-by: Bard Liao <[email protected]>
bardliao
force-pushed
the
partial-match
branch
from
3f0aadd to
00595db
Compare
|
Thanks @plbossart. Updated now. |
|
wow, all checks have passed! |
plbossart
approved these changes
Oct 20, 2023
ranj063
approved these changes
Oct 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We use partial match for connecting DAI link and DAI widget. We need to use partial match for disconnecting, too.
Fixes: fe88788 ("ASoC: SOF: topology: Use partial match for connecting DAI link and DAI widget")