arm/tegra: Call bus_set_iommu() after iommu_device_register()

[linux-2.6-microblaze.git] / drivers / iommu / tegra-smmu.c

diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index 2802e12..3b6449e 100644 (file)
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -949,10 +949,6 @@ struct tegra_smmu *tegra_smmu_probe(struct device *dev,
 
        tegra_smmu_ahb_enable();
 
-       err = bus_set_iommu(&platform_bus_type, &tegra_smmu_ops);
-       if (err < 0)
-               return ERR_PTR(err);
-
        err = iommu_device_sysfs_add(&smmu->iommu, dev, NULL, dev_name(dev));
        if (err)
                return ERR_PTR(err);
@@ -965,6 +961,13 @@ struct tegra_smmu *tegra_smmu_probe(struct device *dev,
                return ERR_PTR(err);
        }
 
+       err = bus_set_iommu(&platform_bus_type, &tegra_smmu_ops);
+       if (err < 0) {
+               iommu_device_unregister(&smmu->iommu);
+               iommu_device_sysfs_remove(&smmu->iommu);
+               return ERR_PTR(err);
+       }
+
        if (IS_ENABLED(CONFIG_DEBUG_FS))
                tegra_smmu_debugfs_init(smmu);