ASoC: amd: yc: Fix the wrong return value
BugLink: https://bugs.launchpad.net/bugs/2102181 [ Upstream commit 984795e76def5c903724b8d6a8228e356bbdf2af ] With the current implementation, when ACP driver fails to read ACPI _WOV entry then the DMI overrides code won't invoke, may cause regressions for some BIOS versions. Add a condition check to jump to check the DMI entries incase of ACP driver fail to read ACPI _WOV method. Fixes: 4095cf872084 (ASoC: amd: yc: Fix for enabling DMIC on acp6x via _DSD entry) Signed-off-by: Venkata Prasad Potturu <venkataprasad.potturu@amd.com> Link: https://patch.msgid.link/20241210091026.996860-1-venkataprasad.potturu@amd.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Mehmet Basaran <mehmet.basaran@canonical.com>
This commit is contained in:
committed by
Mehmet Basaran
parent
df5efb1034
commit
039e636776
@@ -578,14 +578,19 @@ static int acp6x_probe(struct platform_device *pdev)
|
||||
|
||||
handle = ACPI_HANDLE(pdev->dev.parent);
|
||||
ret = acpi_evaluate_integer(handle, "_WOV", NULL, &dmic_status);
|
||||
if (!ACPI_FAILURE(ret))
|
||||
if (!ACPI_FAILURE(ret)) {
|
||||
wov_en = dmic_status;
|
||||
if (!wov_en)
|
||||
return -ENODEV;
|
||||
} else {
|
||||
/* Incase of ACPI method read failure then jump to check_dmi_entry */
|
||||
goto check_dmi_entry;
|
||||
}
|
||||
|
||||
if (is_dmic_enable && wov_en)
|
||||
if (is_dmic_enable)
|
||||
platform_set_drvdata(pdev, &acp6x_card);
|
||||
else
|
||||
return 0;
|
||||
|
||||
check_dmi_entry:
|
||||
/* check for any DMI overrides */
|
||||
dmi_id = dmi_first_match(yc_acp_quirk_table);
|
||||
if (dmi_id)
|
||||
|
||||
Reference in New Issue
Block a user