Merge commit 'b8c93646fd5c' into omap-for-v4.3/fixes

[deliverable/linux.git] / drivers / iommu / of_iommu.c

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 43429ab62228a4d0674dadeab740be812af77ff8..60ba238090d92f3eed93de994d5fd7271a68b8ce 100644 (file)
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -141,10 +141,12 @@ struct iommu_ops *of_iommu_configure(struct device *dev,
        struct iommu_ops *ops = NULL;
        int idx = 0;
 
-       if (dev_is_pci(dev)) {
-               dev_err(dev, "IOMMU is currently not supported for PCI\n");
+       /*
+        * We can't do much for PCI devices without knowing how
+        * device IDs are wired up from the PCI bus to the IOMMU.
+        */
+       if (dev_is_pci(dev))
                return NULL;
-       }
 
        /*
         * We don't currently walk up the tree looking for a parent IOMMU.