hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Mark Brown 2020-11-30 15:59:10 +00:00
parent bbe1f69dce ab5893fdc0
commit f9d8ae0b91
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/amd/raven/pci-acp3x.c
View File

@ -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;
}

2
sound/soc/amd/renoir/rn-pci-acp3x.c
View File

@ -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) {