[PATCH v2 10/13] iommu/rockchip: Constrain return value of ->attach_dev()

Nicolin Chen nicolinc at nvidia.com
Tue Sep 13 22:15:21 PDT 2022


Ensure attach_dev() callback functions only return errno values expected
from the attach_dev() op.

Signed-off-by: Nicolin Chen <nicolinc at nvidia.com>
---
 drivers/iommu/rockchip-iommu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index ab57c4b8fade..de483b5532ed 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1051,8 +1051,10 @@ static int rk_iommu_attach_device(struct iommu_domain *domain,
 		return 0;
 
 	ret = rk_iommu_enable(iommu);
-	if (ret)
+	if (ret) {
 		rk_iommu_detach_device(iommu->domain, dev);
+		ret = -ENODEV;
+	}
 
 	pm_runtime_put(iommu->dev);
 
-- 
2.17.1




More information about the linux-arm-kernel mailing list