ASoC: amd: acp: fix for acp pdm configuration check

vijendarmukunda · broonie · commit 4af565de9f8c · 2024-03-27T15:00:22.000Z
ACP PDM configuration has to be verified for all combinations. Remove FLAG_AMD_LEGACY_ONLY_DMIC check. Fixes: 3a94c8a ("ASoC: amd: acp: add code for scanning acp pdm controller") Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com> Link: https://msgid.link/r/20240327104657.3537664-2-Vijendar.Mukunda@amd.com Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/amd/acp/acp-pci.c b/sound/soc/amd/acp/acp-pci.c
@@ -133,11 +133,9 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id
 		}
 	}
 
-	if (flag == FLAG_AMD_LEGACY_ONLY_DMIC) {
-		ret = check_acp_pdm(pci, chip);
-		if (ret < 0)
-			goto skip_pdev_creation;
-	}
+	ret = check_acp_pdm(pci, chip);
+	if (ret < 0)
+		goto skip_pdev_creation;
 
 	chip->flag = flag;
 	memset(&pdevinfo, 0, sizeof(pdevinfo));

Original file line number	Diff line number	Diff line change
`@@ -133,11 +133,9 @@ static int acp_pci_probe(struct pci_dev pci, const struct pci_device_id pci_id`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`
`136`		`- if (flag == FLAG_AMD_LEGACY_ONLY_DMIC) {`
`137`		`- ret = check_acp_pdm(pci, chip);`
`138`		`- if (ret < 0)`
`139`		`- goto skip_pdev_creation;`
`140`		`- }`
	`136`	`+ ret = check_acp_pdm(pci, chip);`
	`137`	`+ if (ret < 0)`
	`138`	`+ goto skip_pdev_creation;`
`141`	`139`
`142`	`140`	`chip->flag = flag;`
`143`	`141`	`memset(&pdevinfo, 0, sizeof(pdevinfo));`