summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJacob Garber <jgarber1@ualberta.ca>2019-05-27 17:10:24 -0600
committerPatrick Georgi <pgeorgi@google.com>2019-05-29 20:11:19 +0000
commitbdcb4d37506f04e205f11ff45fd0925cf2a5cbc1 (patch)
tree07db46de62e9e7d4836a7507ec24d90d85ea66fc /src
parent924463d1a58075c208b008e13d8b0ec2f2b8731a (diff)
downloadcoreboot-bdcb4d37506f04e205f11ff45fd0925cf2a5cbc1.tar.xz
drivers/generic/max98357a: Add extra error handling
It is possible that acpi_device_scope() and acpi_device_name() can return NULL to indicate an error, so add error handling to check their return values. Change-Id: I4c7ab0c592845d9d5f142e078fc2b505a99ecd12 Signed-off-by: Jacob Garber <jgarber1@ualberta.ca> Found-by: Coverity CID 1362592 Reviewed-on: https://review.coreboot.org/c/coreboot/+/33028 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/drivers/generic/max98357a/max98357a.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c
index 1408dacca6..838491dc84 100644
--- a/src/drivers/generic/max98357a/max98357a.c
+++ b/src/drivers/generic/max98357a/max98357a.c
@@ -36,9 +36,14 @@ static void max98357a_fill_ssdt(struct device *dev)
if (!dev->enabled || !config)
return;
+ const char *scope = acpi_device_scope(dev);
+ const char *name = acpi_device_name(dev);
+ if (!scope || !name)
+ return;
+
/* Device */
- acpigen_write_scope(acpi_device_scope(dev));
- acpigen_write_device(acpi_device_name(dev));
+ acpigen_write_scope(scope);
+ acpigen_write_device(name);
acpigen_write_name_string("_HID", MAX98357A_ACPI_HID);
acpigen_write_name_integer("_UID", 0);
acpigen_write_name_string("_DDN", dev->chip_ops->name);