| Message ID | 20180306030252.3197-3-jeffy.chen@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/03/18 03:02, Jeffy Chen wrote: > Add missing iommu_device_sysfs_remove in error path. Acked-by: Robin Murphy <robin.murphy@arm.com> (strictly you don't need to introduce the additional return, but it's only a couple of lines and definitely not worth respinning just for that) > Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> > Reviewed-by: Tomasz Figa <tfiga@chromium.org> > --- > > Changes in v7: None > Changes in v6: None > Changes in v5: None > Changes in v4: None > Changes in v3: None > Changes in v2: None > > drivers/iommu/rockchip-iommu.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c > index 16cd8780c289..c2ef3cbd4401 100644 > --- a/drivers/iommu/rockchip-iommu.c > +++ b/drivers/iommu/rockchip-iommu.c > @@ -1193,8 +1193,12 @@ static int rk_iommu_probe(struct platform_device *pdev) > > iommu_device_set_ops(&iommu->iommu, &rk_iommu_ops); > err = iommu_device_register(&iommu->iommu); > + if (err) { > + iommu_device_sysfs_remove(&iommu->iommu); > + return err; > + } > > - return err; > + return 0; > } > > static const struct of_device_id rk_iommu_dt_ids[] = { >
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index 16cd8780c289..c2ef3cbd4401 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -1193,8 +1193,12 @@ static int rk_iommu_probe(struct platform_device *pdev) iommu_device_set_ops(&iommu->iommu, &rk_iommu_ops); err = iommu_device_register(&iommu->iommu); + if (err) { + iommu_device_sysfs_remove(&iommu->iommu); + return err; + } - return err; + return 0; } static const struct of_device_id rk_iommu_dt_ids[] = {