ASoC: acpi: fix: continue searching when machine is ignored
[ Upstream commit a3e620f8422832afd832ad5e20aa97d0c72bada8 ] The machine_quirk may return NULL which means the acpi entries should be skipped and search for next matched entry is needed, here add return check here and continue for NULL case. Signed-off-by: Keyon Jie <yang.jie@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
2a031cab71
commit
a8657e6824
1 changed files with 8 additions and 2 deletions
|
@ -10,11 +10,17 @@ struct snd_soc_acpi_mach *
|
|||
snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines)
|
||||
{
|
||||
struct snd_soc_acpi_mach *mach;
|
||||
struct snd_soc_acpi_mach *mach_alt;
|
||||
|
||||
for (mach = machines; mach->id[0]; mach++) {
|
||||
if (acpi_dev_present(mach->id, NULL, -1)) {
|
||||
if (mach->machine_quirk)
|
||||
mach = mach->machine_quirk(mach);
|
||||
if (mach->machine_quirk) {
|
||||
mach_alt = mach->machine_quirk(mach);
|
||||
if (!mach_alt)
|
||||
continue; /* not full match, ignore */
|
||||
mach = mach_alt;
|
||||
}
|
||||
|
||||
return mach;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue