Commit bc847454 authored by Joerg Roedel's avatar Joerg Roedel

iommu/vt-d: Fix up error handling in alloc_iommu

Only check for error when iommu->iommu_dev has been assigned
and only assign drhd->iommu when the function can't fail
anymore.
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 59203379
...@@ -1063,19 +1063,19 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) ...@@ -1063,19 +1063,19 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd)
raw_spin_lock_init(&iommu->register_lock); raw_spin_lock_init(&iommu->register_lock);
drhd->iommu = iommu; if (intel_iommu_enabled) {
if (intel_iommu_enabled)
iommu->iommu_dev = iommu_device_create(NULL, iommu, iommu->iommu_dev = iommu_device_create(NULL, iommu,
intel_iommu_groups, intel_iommu_groups,
"%s", iommu->name); "%s", iommu->name);
if (IS_ERR(iommu->iommu_dev)) { if (IS_ERR(iommu->iommu_dev)) {
drhd->iommu = NULL; err = PTR_ERR(iommu->iommu_dev);
err = PTR_ERR(iommu->iommu_dev); goto err_unmap;
goto err_unmap; }
} }
drhd->iommu = iommu;
return 0; return 0;
err_unmap: err_unmap:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment