UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel 2016-01-07 12:16:51 +01:00
parent 592033790e
commit bc8474549e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/iommu/dmar.c
View File

@ -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: