diff options
| author | Mark Brown <broonie@kernel.org> | 2019-04-02 16:20:47 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-02 16:20:47 +0700 |
| commit | 6d5e2bf9d203e4d9e08ca2e9420c6ff22ad190af (patch) | |
| tree | c2c20648773d3326f942e34ef73b06566f7a19ec /drivers/iommu/iommu.c | |
| parent | b820d52e7eed7b30b2dfef5f4213a2bc3cbea6f3 (diff) | |
| parent | 257f9053c0204ea47491aa236004fd1226f75fa8 (diff) | |
Merge branch 'acpi-utils' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into asoc-5.2
Diffstat (limited to 'drivers/iommu/iommu.c')
| -rw-r--r-- | drivers/iommu/iommu.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 33a982e33716..109de67d5d72 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1105,10 +1105,12 @@ struct iommu_group *iommu_group_get_for_dev(struct device *dev) dom = __iommu_domain_alloc(dev->bus, iommu_def_domain_type); if (!dom && iommu_def_domain_type != IOMMU_DOMAIN_DMA) { - dev_warn(dev, - "failed to allocate default IOMMU domain of type %u; falling back to IOMMU_DOMAIN_DMA", - iommu_def_domain_type); dom = __iommu_domain_alloc(dev->bus, IOMMU_DOMAIN_DMA); + if (dom) { + dev_warn(dev, + "failed to allocate default IOMMU domain of type %u; falling back to IOMMU_DOMAIN_DMA", + iommu_def_domain_type); + } } group->default_domain = dom; |