[PATCH] ASoC: acpi: fix machine driver selection based on quirk

[PATCH] ASoC: acpi: fix machine driver selection based on quirk

[Pierre-Louis Bossart]

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.

back-ported to 4.14-stable from commit 5c256045b87b ("ASoC: acpi: fix
machine driver selection based on quirk") which did not apply cleanly.

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

diff --git a/sound/soc/intel/common/sst-match-acpi.c b/sound/soc/intel/common/sst-match-acpi.c
index 56d26f36a3cb..b4a929562218 100644
--- a/sound/soc/intel/common/sst-match-acpi.c
+++ b/sound/soc/intel/common/sst-match-acpi.c
@@ -83,11 +83,9 @@ struct sst_acpi_mach *sst_acpi_find_machine(struct sst_acpi_mach *machines)
 
 	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;
-- 
2.14.1

Re: [PATCH] ASoC: acpi: fix machine driver selection based on quirk

[Greg KH]

On Thu, Feb 15, 2018 at 04:09:36PM -0600, Pierre-Louis Bossart wrote:
> 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.
> 
> back-ported to 4.14-stable from commit 5c256045b87b ("ASoC: acpi: fix
> machine driver selection based on quirk") which did not apply cleanly.

Thanks, now queued up.

greg k-h