Merge series "ASoC: amd: Minor fixes for error handling" from Takashi Iwai <tiwai@suse.de>: (f9d8ae0b) · Commits · 戴 / test

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

sound/soc/amd/raven/pci-acp3x.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

sound/soc/amd/renoir/rn-pci-acp3x.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {

Admin message