From: Joerg Roedel Date: Wed, 5 Dec 2018 13:39:45 +0000 (+0100) Subject: iommu/of: Don't call iommu_ops->add_device directly X-Git-Tag: v5.0-rc1~68^2^9~2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=641fb0efbff063ed57f108c2eb4a4d26dbd5badd;p=linux.git iommu/of: Don't call iommu_ops->add_device directly Make sure to invoke this call-back through the proper function of the IOMMU-API. Signed-off-by: Joerg Roedel --- diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index dbe73456f1a1..d8947b28db2d 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -222,10 +222,10 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, } /* * If we have reason to believe the IOMMU driver missed the initial - * add_device callback for dev, replay it to get things in order. + * probe for dev, replay it to get things in order. */ - if (ops && ops->add_device && dev->bus && !device_iommu_mapped(dev)) - err = ops->add_device(dev); + if (dev->bus && !device_iommu_mapped(dev)) + err = iommu_probe_device(dev); /* Ignore all other errors apart from EPROBE_DEFER */ if (err == -EPROBE_DEFER) {