From: Joerg Roedel jroedel@suse.de
mainline inclusion from mainline-v4.20-rc1 commit d2e1a003af569e912d5f115a3c20b89a19f5caa0 category:bugfix bugzilla:NA CVE:NA
-------------------
Make sure to invoke this call-back through the proper function of the IOMMU-API.
Acked-by: Hanjun Guo hanjun.guo@linaro.org Signed-off-by: Joerg Roedel jroedel@suse.de Signed-off-by: Chen Jun chenjun102@huawei.com Reviewed-by: Hanjun Guo guohanjun@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/acpi/arm64/iort.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index 9abb86c7044a..cd9becf65a8f 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -810,8 +810,8 @@ static inline int iort_add_device_replay(const struct iommu_ops *ops, { int err = 0;
- if (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);
return err; }