Patch "ASoC: acpi: fix machine driver selection based on quirk" has been added to the 4.14-stable tree

This is a note to let you know that I've just added the patch titled

ASoC: acpi: fix machine driver selection based on quirk

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
asoc-acpi-fix-machine-driver-selection-based-on-quirk.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 5 Jan 2018 14:55:33 -0600
Subject: ASoC: acpi: fix machine driver selection based on quirk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Pierre-Louis Bossart <[email protected]>

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.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=96691

---
 sound/soc/intel/common/sst-match-acpi.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

@@ -83,11 +83,9 @@ struct sst_acpi_mach *sst_acpi_find_mach
 
 	for (mach = machines; mach->id[0]; mach++) {
 		if (sst_acpi_check_hid(mach->id) == true) {
-			if (mach->machine_quirk == NULL)
-				return mach;
-
-			if (mach->machine_quirk(mach) != NULL)
-				return mach;
+			if (mach->machine_quirk)
+				mach = mach->machine_quirk(mach);
+			return mach;
 		}
 	}
 	return NULL;

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/asoc-acpi-fix-machine-driver-selection-based-on-quirk.patch