lkml.org 
[lkml]   [2018]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RESEND PATCH v6 02/14] iommu/rockchip: Fix error handling in probe
    Date
    Add missing iommu_device_sysfs_remove in error path.

    Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
    Reviewed-by: Tomasz Figa <tfiga@chromium.org>
    ---

    Changes in v6: None
    Changes in v5: None
    Changes in v4: None
    Changes in v3: None
    Changes in v2: None

    drivers/iommu/rockchip-iommu.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
    index 16cd8780c289..c2ef3cbd4401 100644
    --- a/drivers/iommu/rockchip-iommu.c
    +++ b/drivers/iommu/rockchip-iommu.c
    @@ -1193,8 +1193,12 @@ static int rk_iommu_probe(struct platform_device *pdev)

    iommu_device_set_ops(&iommu->iommu, &rk_iommu_ops);
    err = iommu_device_register(&iommu->iommu);
    + if (err) {
    + iommu_device_sysfs_remove(&iommu->iommu);
    + return err;
    + }

    - return err;
    + return 0;
    }

    static const struct of_device_id rk_iommu_dt_ids[] = {
    --
    2.11.0

    \
     
     \ /
      Last update: 2018-03-01 11:20    [W:4.240 / U:0.764 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site