diff options
| author | Wolfram Sang <wsa@kernel.org> | 2020-12-07 07:57:42 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2020-12-07 07:57:42 +0100 |
| commit | 1e04538c751bfc572bfa9995996c7f4af098a625 (patch) | |
| tree | 40aa603803f857af4a5a5f25f81b6fb31b8e0152 /drivers/iommu/iommu.c | |
| parent | 5e9a97b1f4491b8b65874901ad084348fcaba327 (diff) | |
| parent | 0477e92881850d44910a7e94fc2c46f96faa131f (diff) | |
Merge branch 'i2c/for-current' into i2c/for-5.11
Diffstat (limited to 'drivers/iommu/iommu.c')
| -rw-r--r-- | drivers/iommu/iommu.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 8c470f451a32..0f4dc25d46c9 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -264,16 +264,18 @@ int iommu_probe_device(struct device *dev) */ iommu_alloc_default_domain(group, dev); - if (group->default_domain) + if (group->default_domain) { ret = __iommu_attach_device(group->default_domain, dev); + if (ret) { + iommu_group_put(group); + goto err_release; + } + } iommu_create_device_direct_mappings(group, dev); iommu_group_put(group); - if (ret) - goto err_release; - if (ops->probe_finalize) ops->probe_finalize(dev); @@ -2071,7 +2073,7 @@ EXPORT_SYMBOL_GPL(iommu_uapi_cache_invalidate); static int iommu_check_bind_data(struct iommu_gpasid_bind_data *data) { - u32 mask; + u64 mask; int i; if (data->version != IOMMU_GPASID_BIND_VERSION_1) |