summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-01-22 07:27:17 +1300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-01-22 07:27:17 +1300
commit52e60b754438f34d23348698534e9ca63cd751d7 (patch)
tree445ceabeaa723e196a77ce0d35fef66cb40cd4c4
parent57ef300e4627db5bf41695b1932c24979efa600e (diff)
parente8e683ae9a736407a20135df7809090a446db707 (diff)
downloadblackbird-op-linux-52e60b754438f34d23348698534e9ca63cd751d7.tar.gz
blackbird-op-linux-52e60b754438f34d23348698534e9ca63cd751d7.zip
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
-rw-r--r--drivers/iommu/of_iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index d8947b28db2d..f04a6df65eb8 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -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
* 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);
/* Ignore all other errors apart from EPROBE_DEFER */
OpenPOWER on IntegriCloud