瀏覽代碼

iommu: Checking for NULL instead of IS_ERR

The iommu_group_alloc() and iommu_group_get_for_dev()
functions return error pointers, they never return NULL.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Dan Carpenter 10 年之前
父節點
當前提交
409e553dee
共有 1 個文件被更改,包括 12 次插入11 次删除
  1. 12 11
      drivers/iommu/iommu.c

+ 12 - 11
drivers/iommu/iommu.c

@@ -788,15 +788,16 @@ static struct iommu_group *iommu_group_get_for_pci_dev(struct pci_dev *pdev)
 
 
 	/* No shared group found, allocate new */
 	/* No shared group found, allocate new */
 	group = iommu_group_alloc();
 	group = iommu_group_alloc();
-	if (group) {
-		/*
-		 * Try to allocate a default domain - needs support from the
-		 * IOMMU driver.
-		 */
-		group->default_domain = __iommu_domain_alloc(pdev->dev.bus,
-							     IOMMU_DOMAIN_DMA);
-		group->domain = group->default_domain;
-	}
+	if (IS_ERR(group))
+		return NULL;
+
+	/*
+	 * Try to allocate a default domain - needs support from the
+	 * IOMMU driver.
+	 */
+	group->default_domain = __iommu_domain_alloc(pdev->dev.bus,
+						     IOMMU_DOMAIN_DMA);
+	group->domain = group->default_domain;
 
 
 	return group;
 	return group;
 }
 }
@@ -1548,8 +1549,8 @@ int iommu_request_dm_for_dev(struct device *dev)
 
 
 	/* Device must already be in a group before calling this function */
 	/* Device must already be in a group before calling this function */
 	group = iommu_group_get_for_dev(dev);
 	group = iommu_group_get_for_dev(dev);
-	if (!group)
-		return -EINVAL;
+	if (IS_ERR(group))
+		return PTR_ERR(group);
 
 
 	mutex_lock(&group->mutex);
 	mutex_lock(&group->mutex);