Commit b8f80bff authored Mar 14, 2014 by Laurent Pinchart

iommu/ipmmu-vmsa: Cleanup failures of ARM mapping creation or attachment

The ARM IOMMU mapping needs to be released when attaching the device
fails. Add arm_iommu_release_mapping() to the error code path. This is
safe to call with a NULL mapping, so no specific check is needed.

Cleanup is also missing when failing to create a mapping. Jump to the
error code path in that case instead of returning immediately.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

parent eaa27f34

drivers/iommu/ipmmu-vmsa.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1090,7 +1090,8 @@ static int ipmmu_add_device(struct device *dev)
		SZ_1G, SZ_2G);
		if (IS_ERR(mapping)) {
		dev_err(mmu->dev, "failed to create ARM IOMMU mapping\n");
		return PTR_ERR(mapping);
		ret = PTR_ERR(mapping);
		goto error;
		}

		mmu->mapping = mapping;
		@@ -1106,6 +1107,7 @@ static int ipmmu_add_device(struct device *dev)
		return 0;

		error:
		arm_iommu_release_mapping(mmu->mapping);
		kfree(dev->archdata.iommu);
		dev->archdata.iommu = NULL;
		iommu_group_remove_device(dev);