Unverified Commit 5c256045 authored Jan 05, 2018 by Pierre-Louis Bossart Committed by Mark Brown Jan 08, 2018

ASoC: acpi: fix machine driver selection based on quirk

The ACPI/machine-driver code refactoring introduced in 4.13 introduced
a regression for cases where we need a DMI-based quirk to select the
machine driver (the BIOS reports an invalid HID). The fix is just to
make sure the results of the quirk are actually used.

Fixes: 54746dab ('ASoC: Improve machine driver selection based on quirk data')
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=96691


Tested-by: Nicole Færber <nicole.faerber@dpin.de>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org

parent 20a1ea22

sound/soc/soc-acpi.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -84,10 +84,8 @@ snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines)

		for (mach = machines; mach->id[0]; mach++) {
		if (snd_soc_acpi_check_hid(mach->id) == true) {
		if (mach->machine_quirk == NULL)
		return mach;

		if (mach->machine_quirk(mach) != NULL)
		if (mach->machine_quirk)
		mach = mach->machine_quirk(mach);
		return mach;
		}
		}

Admin message