Skip to content

Commit 8fba13f

Browse files
Dan Carpenterbroonie
authored andcommitted
ASoC: loongson: fix error codes in loongson_card_parse_acpi()
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: d240286 ("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>
1 parent 2f76e1d commit 8fba13f

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

sound/soc/loongson/loongson_card.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ static int loongson_card_parse_acpi(struct loongson_card_data *data)
8181
/* fixup platform name based on reference node */
8282
memset(&args, 0, sizeof(args));
8383
ret = acpi_node_get_property_reference(fwnode, "cpu", 0, &args);
84-
if (ACPI_FAILURE(ret) || !is_acpi_device_node(args.fwnode)) {
84+
if (ret || !is_acpi_device_node(args.fwnode)) {
8585
dev_err(card->dev, "No matching phy in ACPI table\n");
86-
return ret;
86+
return ret ?: -ENOENT;
8787
}
8888
adev = to_acpi_device_node(args.fwnode);
8989
phy_dev = acpi_get_first_physical_node(adev);
@@ -95,9 +95,9 @@ static int loongson_card_parse_acpi(struct loongson_card_data *data)
9595
/* fixup codec name based on reference node */
9696
memset(&args, 0, sizeof(args));
9797
ret = acpi_node_get_property_reference(fwnode, "codec", 0, &args);
98-
if (ACPI_FAILURE(ret) || !is_acpi_device_node(args.fwnode)) {
98+
if (ret || !is_acpi_device_node(args.fwnode)) {
9999
dev_err(card->dev, "No matching phy in ACPI table\n");
100-
return ret;
100+
return ret ?: -ENOENT;
101101
}
102102
adev = to_acpi_device_node(args.fwnode);
103103
snprintf(codec_name, sizeof(codec_name), "i2c-%s", acpi_dev_name(adev));

0 commit comments

Comments
 (0)