Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 409e553d authored by Dan Carpenter's avatar Dan Carpenter Committed by Joerg Roedel
Browse files

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 3a18404c

drivers/iommu/iommu.c

+12 −11
Original line number Diff line number Diff line
@@ -788,7 +788,9 @@ static struct iommu_group *iommu_group_get_for_pci_dev(struct pci_dev *pdev) 


	/* No shared group found, allocate new */

	group = iommu_group_alloc();

	if (group) {

	if (IS_ERR(group))

		return NULL;



	/*

	 * Try to allocate a default domain - needs support from the

	 * IOMMU driver.
@@ -796,7 +798,6 @@ static struct iommu_group *iommu_group_get_for_pci_dev(struct pci_dev *pdev) 
	group->default_domain = __iommu_domain_alloc(pdev->dev.bus,

						     IOMMU_DOMAIN_DMA);

	group->domain = group->default_domain;

	}



	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 */

	group = iommu_group_get_for_dev(dev);

	if (!group)

		return -EINVAL;

	if (IS_ERR(group))

		return PTR_ERR(group);



	mutex_lock(&group->mutex);