Commit dc9de8a2 authored Dec 20, 2018 by Joerg Roedel

iommu: Check for iommu_ops == NULL in iommu_probe_device()



This check needs to be there and got lost at some point
during development. Add it again.

Fixes: 641fb0ef ('iommu/of: Don't call iommu_ops->add_device directly')
Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reported-by: kernelci.org bot <bot@kernelci.org>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

parent d2e1a003

drivers/iommu/iommu.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -114,10 +114,14 @@ void iommu_device_unregister(struct iommu_device *iommu)
		int iommu_probe_device(struct device *dev)
		{
		const struct iommu_ops *ops = dev->bus->iommu_ops;
		int ret = -EINVAL;

		WARN_ON(dev->iommu_group);

		return ops->add_device(dev);
		if (ops)
		ret = ops->add_device(dev);

		return ret;
		}

		void iommu_release_device(struct device *dev)

Admin message