diff options
| author | Mark Brown <broonie@kernel.org> | 2020-11-30 16:05:07 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-11-30 16:05:07 +0000 |
| commit | e5879d988291a964a87c4868057dc989d901eea0 (patch) | |
| tree | 465bb757245f6c9050315d8aae61ad081affc676 /sound/soc/amd | |
| parent | 645be01d7b553e9ab0791ceb88f381a087d691d9 (diff) | |
| parent | f9d8ae0b91763765686833e500af0256bf769ba2 (diff) | |
| download | lwn-e5879d988291a964a87c4868057dc989d901eea0.tar.gz lwn-e5879d988291a964a87c4868057dc989d901eea0.zip | |
Merge branch 'for-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.11
Diffstat (limited to 'sound/soc/amd')
| -rw-r--r-- | sound/soc/amd/raven/pci-acp3x.c | 1 | ||||
| -rw-r--r-- | sound/soc/amd/renoir/rn-pci-acp3x.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index cd5b097a9402..bd0b1554bd4e 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -232,6 +232,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, break; default: dev_info(&pci->dev, "ACP audio mode : %d\n", val); + break; } pm_runtime_set_autosuspend_delay(&pci->dev, 2000); pm_runtime_use_autosuspend(&pci->dev); diff --git a/sound/soc/amd/renoir/rn-pci-acp3x.c b/sound/soc/amd/renoir/rn-pci-acp3x.c index b943e59fc302..877350f38a68 100644 --- a/sound/soc/amd/renoir/rn-pci-acp3x.c +++ b/sound/soc/amd/renoir/rn-pci-acp3x.c @@ -224,7 +224,7 @@ static int snd_rn_acp_probe(struct pci_dev *pci, handle = ACPI_HANDLE(&pci->dev); ret = acpi_evaluate_integer(handle, "_WOV", NULL, &dmic_status); if (ACPI_FAILURE(ret)) { - ret = -EINVAL; + ret = -ENODEV; goto de_init; } if (!dmic_status) { |