lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 397/639] iommu: Use right function to get group for device
    Date
    From: Lu Baolu <baolu.lu@linux.intel.com>

    [ Upstream commit 57274ea25736496ee019a5c40479855b21888839 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iommu/iommu.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
    index b82bec4224b91..00e1c908cd8e7 100644
    --- a/drivers/iommu/iommu.c
    +++ b/drivers/iommu/iommu.c
    @@ -1900,9 +1900,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);

    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:22    [W:4.499 / U:0.792 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site