]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: amd: ps: honor machine_check in SoundWire machine select
authorVijendar Mukunda <Vijendar.Mukunda@amd.com>
Tue, 9 Jun 2026 14:32:12 +0000 (20:02 +0530)
committerMark Brown <broonie@kernel.org>
Tue, 9 Jun 2026 17:42:25 +0000 (18:42 +0100)
Only accept an ACPI machine table entry when machine_check is absent
or returns true, matching other AMD SoundWire machine select paths.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://patch.msgid.link/20260609143230.3310356-1-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/amd/ps/pci-ps.c

index 9751cf0784a6dbd47c1547b4cde0cfb1d2e5d845..4ecda224157b5f58ab2a4474e6ad1fe980a000e8 100644 (file)
@@ -329,7 +329,8 @@ static struct snd_soc_acpi_mach *acp63_sdw_machine_select(struct device *dev)
                                        break;
                        }
                        if (i == acp_data->info.count || !link->num_adr)
-                               break;
+                               if (!mach->machine_check || mach->machine_check(acp_data->sdw))
+                                       break;
                }
                if (mach && mach->link_mask) {
                        mach->mach_params.links = mach->links;