diff options
| author | Mark Brown <broonie@kernel.org> | 2020-11-30 15:59:10 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-11-30 15:59:10 +0000 |
| commit | f9d8ae0b91763765686833e500af0256bf769ba2 (patch) | |
| tree | 9854a6db8bedd9c650a8fc6d0800569b71bc37cc | |
| parent | bbe1f69dce94089943cc407a88325ae7e851d49c (diff) | |
| parent | ab5893fdc0693e4f747ef26194b6bbf628bdb044 (diff) | |
| download | linux-stable-f9d8ae0b91763765686833e500af0256bf769ba2.tar.gz linux-stable-f9d8ae0b91763765686833e500af0256bf769ba2.tar.bz2 linux-stable-f9d8ae0b91763765686833e500af0256bf769ba2.zip | |
Merge series "ASoC: amd: Minor fixes for error handling" from Takashi Iwai <tiwai@suse.de>:
Hi,
this is a set of patches to address the errors appearing on the
machine that has no I2S DMIC on AMD machine but probed.
Takashi
===
Takashi Iwai (2):
ASoC: amd: Downgrade print level for invalid ACP mode
ASoC: amd: Return -ENODEV for non-existing ACPI call
sound/soc/amd/raven/pci-acp3x.c | 2 +-
sound/soc/amd/renoir/rn-pci-acp3x.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
2.26.2
| -rw-r--r-- | sound/soc/amd/raven/pci-acp3x.c | 2 | ||||
| -rw-r--r-- | sound/soc/amd/renoir/rn-pci-acp3x.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index 31b797c8bfe6..a7de4e607961 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -231,7 +231,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, } break; default: - dev_err(&pci->dev, "Invalid ACP audio mode : %d\n", val); + dev_info(&pci->dev, "Invalid ACP audio mode : %d\n", val); ret = -ENODEV; goto disable_msi; } 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) { |