diff options
| author | Keyon Jie | 2018-11-17 01:47:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-12-17 09:24:33 +0100 |
| commit | a8657e68242772354aeaa0ccd0f35f1bcf1cceaa (patch) | |
| tree | 0bd45bfaeb459441838da93994007ffa20569f33 /sound/soc | |
| parent | PCI: imx6: Fix link training status detection in link up check (diff) | |
| download | kernel-qcow2-linux-a8657e68242772354aeaa0ccd0f35f1bcf1cceaa.tar.gz kernel-qcow2-linux-a8657e68242772354aeaa0ccd0f35f1bcf1cceaa.tar.xz kernel-qcow2-linux-a8657e68242772354aeaa0ccd0f35f1bcf1cceaa.zip | |
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-acpi.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/soc/soc-acpi.c b/sound/soc/soc-acpi.c index b8e72b52db30..4fb29f0e561e 100644 --- a/sound/soc/soc-acpi.c +++ b/sound/soc/soc-acpi.c @@ -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; } } |