ASoC: acpi: fix machine driver selection based on quirk
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Fri, 5 Jan 2018 20:55:33 +0000 (14:55 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 Feb 2018 14:42:33 +0000 (15:42 +0100)
commitf1a81c0eab38a1cf8887cd10731c77ad547cc17c
treeff8677f46e1860484f6f4bc55b37470c04254050
parent9a2b3777bd5335e34ec585ecc8e29d575dfc8c13
ASoC: acpi: fix machine driver selection based on quirk

commit 5c256045b87b8aa8e5bc9d2e2fdc0802351c1f99 upstream.

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: 54746dabf770 ('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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/intel/common/sst-match-acpi.c