diff options
author | Joerg Roedel <jroedel@suse.de> | 2014-08-21 17:06:48 -0400 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2014-08-26 05:15:17 -0400 |
commit | c0df975f9045d6b2b13d88746e628ac308ff49ea (patch) | |
tree | 48058cedcc8de6cea39c21949daa60059087b3c0 | |
parent | c4a783b89ee3fc1201510ecf204278da4ccb0993 (diff) |
iommu/vt-d: Check return value of acpi_bus_get_device()
Checking adev == NULL is not sufficient as
acpi_bus_get_device() might not touch the value of this
parameter in an error case, so check the return value
directly.
Fixes: ed40356b5fcf1ce28e026ab39c5b2b6939068b50
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
-rw-r--r-- | drivers/iommu/dmar.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 60ab474bfff3..06d268abe951 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c | |||
@@ -678,8 +678,7 @@ static int __init dmar_acpi_dev_scope_init(void) | |||
678 | andd->device_name); | 678 | andd->device_name); |
679 | continue; | 679 | continue; |
680 | } | 680 | } |
681 | acpi_bus_get_device(h, &adev); | 681 | if (acpi_bus_get_device(h, &adev)) { |
682 | if (!adev) { | ||
683 | pr_err("Failed to get device for ACPI object %s\n", | 682 | pr_err("Failed to get device for ACPI object %s\n", |
684 | andd->device_name); | 683 | andd->device_name); |
685 | continue; | 684 | continue; |