diff options
| author | Mark Brown <broonie@kernel.org> | 2024-04-03 16:07:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-04-03 16:07:41 +0100 |
| commit | 327719aa629fa6382ecd38996191c4bc9ef0174b (patch) | |
| tree | aef80029634e52fed35890894f303a09622e4202 /sound/soc/amd | |
| parent | 5faf65b5d1e36ec0a1eb3ba8ba2a8b7a779575ce (diff) | |
| parent | 09bbc4f0d6ed0c7ca68c0c5fda9613917a1c9f6e (diff) | |
ASoC: Merge up fixes
Some of these, particularly the wm_adsp one in the immediate case, are
needed as a basis for new work.
Diffstat (limited to 'sound/soc/amd')
| -rw-r--r-- | sound/soc/amd/acp/acp-pci.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sound/soc/amd/acp/acp-pci.c b/sound/soc/amd/acp/acp-pci.c index 8c8b1dcac628..5f35b90eab8d 100644 --- a/sound/soc/amd/acp/acp-pci.c +++ b/sound/soc/amd/acp/acp-pci.c @@ -115,7 +115,10 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id goto unregister_dmic_dev; } - acp_init(chip); + ret = acp_init(chip); + if (ret) + goto unregister_dmic_dev; + res = devm_kcalloc(&pci->dev, num_res, sizeof(struct resource), GFP_KERNEL); if (!res) { ret = -ENOMEM; @@ -133,11 +136,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)); |