diff options
| author | Jeffy Chen <jeffy.chen@rock-chips.com> | 2018-03-23 15:38:12 +0800 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2018-03-29 12:22:28 +0200 |
| commit | 4d88a8a4c345cd16f634df855148cfb2a59a204a (patch) | |
| tree | 219e1abe1477743cab3db750d81285921651ccb3 /drivers/iommu | |
| parent | 5fd577c3eac3bdb9aebfec01e9b3d7f07a14f2dd (diff) | |
| download | linux-stable-4d88a8a4c345cd16f634df855148cfb2a59a204a.tar.gz linux-stable-4d88a8a4c345cd16f634df855148cfb2a59a204a.tar.bz2 linux-stable-4d88a8a4c345cd16f634df855148cfb2a59a204a.zip | |
iommu/rockchip: Fix error handling in init
It's hard to undo bus_set_iommu() in the error path, so move it to the
end of rk_iommu_probe().
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/rockchip-iommu.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index bd8580b897e9..0ce5e8a0658c 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -1133,6 +1133,8 @@ static int rk_iommu_probe(struct platform_device *pdev) if (!dma_dev) dma_dev = &pdev->dev; + bus_set_iommu(&platform_bus_type, &rk_iommu_ops); + return 0; err_remove_sysfs: iommu_device_sysfs_remove(&iommu->iommu); @@ -1176,19 +1178,6 @@ static struct platform_driver rk_iommu_driver = { static int __init rk_iommu_init(void) { - struct device_node *np; - int ret; - - np = of_find_matching_node(NULL, rk_iommu_dt_ids); - if (!np) - return 0; - - of_node_put(np); - - ret = bus_set_iommu(&platform_bus_type, &rk_iommu_ops); - if (ret) - return ret; - return platform_driver_register(&rk_iommu_driver); } subsys_initcall(rk_iommu_init); |