projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iommu-updates-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...
[linux-2.6-block.git]
/
drivers
/
iommu
/
intel-iommu.c
diff --git
a/drivers/iommu/intel-iommu.c
b/drivers/iommu/intel-iommu.c
index d42a3f3fef4f8476cd5757b65da4be96718f8f3f..a35927cd42e515cc81294a94e3c1c3500d51d293 100644
(file)
--- a/
drivers/iommu/intel-iommu.c
+++ b/
drivers/iommu/intel-iommu.c
@@
-694,7
+694,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();