Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932379AbeAKIXg (ORCPT + 1 other); Thu, 11 Jan 2018 03:23:36 -0500 Received: from regular1.263xmail.com ([211.150.99.133]:45296 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932180AbeAKIXe (ORCPT ); Thu, 11 Jan 2018 03:23:34 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 From: Jeffy Chen To: linux-kernel@vger.kernel.org Cc: jcliang@chromium.org, robin.murphy@arm.com, tfiga@chromium.org, Jeffy Chen , Heiko Stuebner , linux-rockchip@lists.infradead.org, iommu@lists.linux-foundation.org, Joerg Roedel , linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/9] iommu/rockchip: Fix error handling in init Date: Thu, 11 Jan 2018 16:22:24 +0800 Message-Id: <20180111082229.24011-5-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180111082229.24011-1-jeffy.chen@rock-chips.com> References: <20180111082229.24011-1-jeffy.chen@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: It's hard to undo bus_set_iommu() in the error path, so move it to the end of init call. Signed-off-by: Jeffy Chen --- drivers/iommu/rockchip-iommu.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index a05844cabb45..5f141390b4d7 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -1247,17 +1247,25 @@ static int __init rk_iommu_init(void) of_node_put(np); - ret = bus_set_iommu(&platform_bus_type, &rk_iommu_ops); - if (ret) - return ret; - ret = platform_driver_register(&rk_iommu_domain_driver); if (ret) return ret; ret = platform_driver_register(&rk_iommu_driver); if (ret) - platform_driver_unregister(&rk_iommu_domain_driver); + goto err_unreg_domain_drv; + + ret = bus_set_iommu(&platform_bus_type, &rk_iommu_ops); + if (ret) + goto err_unreg_iommu_drv; + + return 0; + +err_unreg_iommu_drv: + platform_driver_unregister(&rk_iommu_driver); +err_unreg_domain_drv: + platform_driver_unregister(&rk_iommu_domain_driver); + return ret; } static void __exit rk_iommu_exit(void) -- 2.11.0