]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
iommu: Checking for NULL instead of IS_ERR
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 10 Jun 2015 10:59:27 +0000 (13:59 +0300)
committerJoerg Roedel <jroedel@suse.de>
Thu, 11 Jun 2015 07:42:25 +0000 (09:42 +0200)
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>
drivers/iommu/iommu.c

index 3b1a2551a74744ff116178babfde80111c5155d0..89dc50b9acdc07f21e4ec384151a3e8e72139156 100644 (file)
@@ -788,15 +788,16 @@ 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) {
-               /*
-                * 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;
 }
@@ -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);