summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLu Baolu <baolu.lu@linux.intel.com>2019-05-21 15:27:35 +0800
committerJoerg Roedel <jroedel@suse.de>2019-05-27 16:30:59 +0200
commit57274ea25736496ee019a5c40479855b21888839 (patch)
treeb323e8f83c00f64f3ec374e5401a2ec7c8fcbe85
parentcd6c84d8f0cdc911df435bb075ba22ce3c605b07 (diff)
downloadlinux-57274ea25736496ee019a5c40479855b21888839.tar.gz
linux-57274ea25736496ee019a5c40479855b21888839.tar.bz2
linux-57274ea25736496ee019a5c40479855b21888839.zip
iommu: Use right function to get group for device
The iommu_group_get_for_dev() will allocate a group for a device if it isn't in any group. This isn't the use case in iommu_request_dm_for_dev(). Let's use iommu_group_get() instead. Fixes: d290f1e70d85a ("iommu: Introduce iommu_request_dm_for_dev()") Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r--drivers/iommu/iommu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 67ee6623f9b2..3fa025f849e9 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -1915,9 +1915,9 @@ int iommu_request_dm_for_dev(struct device *dev)
int ret;
/* Device must already be in a group before calling this function */
- group = iommu_group_get_for_dev(dev);
- if (IS_ERR(group))
- return PTR_ERR(group);
+ group = iommu_group_get(dev);
+ if (!group)
+ return -EINVAL;
mutex_lock(&group->mutex);