Merge branch 'device-properties'

[linux-beck.git] / drivers / iommu / intel-iommu.c

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 2d1e05bdbb53f5901035294a71c65231b004a338..4fc1f8a7f98e455dc8741a0895c8f279972dee16 100644 (file)
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -684,7 +684,7 @@ static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devf
        if (dev_is_pci(dev)) {
                pdev = to_pci_dev(dev);
                segment = pci_domain_nr(pdev->bus);
-       } else if (ACPI_COMPANION(dev))
+       } else if (has_acpi_companion(dev))
                dev = &ACPI_COMPANION(dev)->dev;
 
        rcu_read_lock();