FAILED: patch "[PATCH] ASoC: acpi: fix machine driver selection based on quirk" failed to apply to 4.14-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
5c256045b87b8aa8e5bc9d2e2fdc0802351c1f99Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <[email protected]>
Date: Fri, 5 Jan 2018 14:55:33 -0600
Subject: [PATCH] ASoC: acpi: fix machine driver selection based on quirk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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/soc-acpi.c +3 -5
@@ -84,11 +84,9 @@ 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 ) -return mach; +if (mach->machine_quirk) + mach = mach->machine_quirk (mach); +return mach; } }return NULL ;