ASoC: acpi: fix: continue searching when machine is ignored (a3e620f8) · Commits · 戴 / test

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>

sound/soc/soc-acpi.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}

Admin message