xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge keystone/mirror-android12-5.10 into keystone/android12-5.10-keystone-qcom-dev

Browse Source 
* keystone/mirror-android12-5.10:
  UPSTREAM: ASoC: dapm: use component prefix when checking widget names

Signed-off-by: deyaoren@google.com <deyaoren@google.com>
Change-Id: Icb93cd1d8e42dd368fa183f0737f7f8cb04c6664
This commit is contained in:
deyaoren@google.com
2021-12-08 17:13:46 +00:00
parent f6ad259f28 672d51b2a7
commit ccf16a2de1
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/soc-dapm.c
View File

@@ -2528,9 +2528,20 @@ static struct snd_soc_dapm_widget *dapm_find_widget(
{ {
struct snd_soc_dapm_widget *w; struct snd_soc_dapm_widget *w;
struct snd_soc_dapm_widget *fallback = NULL; struct snd_soc_dapm_widget *fallback = NULL;
char prefixed_pin[80];
const char *pin_name;
const char *prefix = soc_dapm_prefix(dapm);
if (prefix) {
snprintf(prefixed_pin, sizeof(prefixed_pin), "%s %s",
prefix, pin);
pin_name = prefixed_pin;
} else {
pin_name = pin;
}
for_each_card_widgets(dapm->card, w) { for_each_card_widgets(dapm->card, w) {
if (!strcmp(w->name, pin)) { if (!strcmp(w->name, pin_name)) {
if (w->dapm == dapm) if (w->dapm == dapm)
return w; return w;
else else