diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2020-03-08 14:05:33 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-08 14:05:33 -0300 |
| commit | cd7c926fa65431a20a044f55dbd7609beaffbe46 (patch) | |
| tree | 2111e8c1e50e3fa56fc46bd4e80e5a577459e768 /drivers/iommu/iommu.c | |
| parent | 6da05a37e79c312208df0a070ea2fdd35a7d5e51 (diff) | |
| parent | f2c1392ff3473a396e4d177ff5ad368b9d6cd211 (diff) | |
Merge pull request #61 from toradex/4.14-2.3.x-imx
4.14 2.3.x imx: net: sch_generic compilation fix, rel_imx_4.14.98_2.3.1_patch and v4.14.170 stable
Diffstat (limited to 'drivers/iommu/iommu.c')
| -rw-r--r-- | drivers/iommu/iommu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 1620a6f49989..2c48a9d6d91e 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -613,6 +613,7 @@ err_put_group: mutex_unlock(&group->mutex); dev->iommu_group = NULL; kobject_put(group->devices_kobj); + sysfs_remove_link(group->devices_kobj, device->name); err_free_name: kfree(device->name); err_remove_link: @@ -1855,9 +1856,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); |