Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d88a8a4 authored by Jeffy Chen's avatar Jeffy Chen Committed by Joerg Roedel
Browse files

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: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: default avatarTomasz Figa <tfiga@chromium.org>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 5fd577c3

drivers/iommu/rockchip-iommu.c

+2 −13
Original line number Diff line number Diff line
@@ -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);