Commit 52e60b75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-fixes-v5.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu 

Pull IOMMU fix from Joerg Roedel:
 "One fix only for now: Fix probe deferral in iommu/of code (broke with
  recent changes to iommu_ops->add_device invocation)"

* tag 'iommu-fixes-v5.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/of: Fix probe-deferral
parents 57ef300e e8e683ae

drivers/iommu/of_iommu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -224,7 +224,7 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, 
	 * If we have reason to believe the IOMMU driver missed the initial

	 * If we have reason to believe the IOMMU driver missed the initial

	 * probe for dev, replay it to get things in order.

	 * probe for dev, replay it to get things in order.

	 */

	 */

	if (dev->bus && !device_iommu_mapped(dev))

	if (!err && dev->bus && !device_iommu_mapped(dev))

		err = iommu_probe_device(dev);

		err = iommu_probe_device(dev);





	/* Ignore all other errors apart from EPROBE_DEFER */

	/* Ignore all other errors apart from EPROBE_DEFER */

CRA Git | Maintained and supported by SUSTech CRA and CCSE