summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5d9d60a)
raw | patch | inline | side by side (parent: 5d9d60a)
author | Dan Carpenter <dan.carpenter@oracle.com> | |
Wed, 10 Jun 2015 10:59:27 +0000 (13:59 +0300) | ||
committer | Alex Shi <alex.shi@linaro.org> | |
Mon, 18 Apr 2016 06:28:06 +0000 (14:28 +0800) |
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>
(cherry picked from commit 409e553deeeb08d644ed1110e0f1c97b71cb6409)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
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>
(cherry picked from commit 409e553deeeb08d644ed1110e0f1c97b71cb6409)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
drivers/iommu/iommu.c | patch | blob | history |
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index e025b5a8b42d2b6c313058bbc7c60990fc07399a..49e7542510d15caac5622cdb01fdcf8b77bb80e8 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
/* 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;
}
/* 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);