iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: loongson: fix error codes in loongson_card_parse_acpi()

Browse Source 
The acpi_node_get_property_reference() function returns kernel error
codes and not ACPI error codes.  So, although it does not affect the
compiled code, using the ACPI_FAILURE() macro is wrong.  Secondly,
if the is_acpi_device_node() function returns false, then we should
return -ENOENT instead of returning success.

Fixes: d24028606e76 ("ASoC: loongson: Add Loongson ASoC Sound Card Support")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/fb14815d-2f9a-4b42-b193-cec61e7417ca@moroto.mountain
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Dan Carpenter 2023-06-19 12:46:21 +03:00 committed by Mark Brown
parent 2f76e1d6ca
commit 8fba13f02c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/loongson/loongson_card.c
View File

@ -81,9 +81,9 @@ static int loongson_card_parse_acpi(struct loongson_card_data *data)
/* fixup platform name based on reference node */
memset(&args, 0, sizeof(args));
ret = acpi_node_get_property_reference(fwnode, "cpu", 0, &args);
if (ACPI_FAILURE(ret) || !is_acpi_device_node(args.fwnode)) {
if (ret || !is_acpi_device_node(args.fwnode)) {
dev_err(card->dev, "No matching phy in ACPI table\n");
return ret;
return ret ?: -ENOENT;
}
adev = to_acpi_device_node(args.fwnode);
phy_dev = acpi_get_first_physical_node(adev);
@ -95,9 +95,9 @@ static int loongson_card_parse_acpi(struct loongson_card_data *data)
/* fixup codec name based on reference node */
memset(&args, 0, sizeof(args));
ret = acpi_node_get_property_reference(fwnode, "codec", 0, &args);
if (ACPI_FAILURE(ret) || !is_acpi_device_node(args.fwnode)) {
if (ret || !is_acpi_device_node(args.fwnode)) {
dev_err(card->dev, "No matching phy in ACPI table\n");
return ret;
return ret ?: -ENOENT;
}
adev = to_acpi_device_node(args.fwnode);
snprintf(codec_name, sizeof(codec_name), "i2c-%s", acpi_dev_name(adev));