right, i think so, will do it in the next version.
@@ -837,7 +837,7 @@ static int rk_iommu_attach_device(struct
iommu_domain *domain,
ret = rk_iommu_enable_paging(iommu);
if (ret)
- return ret;
+ goto err_disable_stall;
spin_lock_irqsave(&rk_domain->iommus_lock, flags);
list_add_tail(&iommu->node, &rk_domain->iommus);
@@ -848,6 +848,11 @@ static int rk_iommu_attach_device(struct
iommu_domain *domain,
rk_iommu_disable_stall(iommu);
return 0;
Nit: if you like, it looks reasonable to name the label
"out_disable_stall" and remove these lines above here, to save the
duplication between the error and success paths (since ret will already
be 0 on the latter).
Either way,
Reviewed-by: Robin Murphy <robin.murphy@xxxxxxx>