diff options
| author | Dan Carpenter <dan.carpenter@linaro.org> | 2023-06-19 12:46:21 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-06-19 12:59:28 +0100 |
| commit | 8fba13f02c85b90deeba65a398f55d4b43a79595 (patch) | |
| tree | 75220a644ba206a5349ab422c1b7f7a09e5bbc48 | |
| parent | 2f76e1d6ca524a888d29aafe29f2ad2003857971 (diff) | |
| download | lwn-8fba13f02c85b90deeba65a398f55d4b43a79595.tar.gz lwn-8fba13f02c85b90deeba65a398f55d4b43a79595.zip | |
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: 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>
| -rw-r--r-- | sound/soc/loongson/loongson_card.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/loongson/loongson_card.c b/sound/soc/loongson/loongson_card.c index 965eaf4e9109..08df05cb4328 100644 --- a/sound/soc/loongson/loongson_card.c +++ b/sound/soc/loongson/loongson_card.c @@ -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)); |