diff options
| author | Joerg Roedel <jroedel@suse.de> | 2017-08-30 15:06:43 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2017-08-30 17:28:32 +0200 |
| commit | 96302d89a03524e04d46ec82c6730881bb755923 (patch) | |
| tree | b7afae07ad2b0e76ad22944cbe66e1b7bf8d66fa /drivers/iommu/tegra-smmu.c | |
| parent | c184ae83c8337d8ee0e5e9de9e7ce2fc652137aa (diff) | |
| download | talos-op-linux-96302d89a03524e04d46ec82c6730881bb755923.tar.gz talos-op-linux-96302d89a03524e04d46ec82c6730881bb755923.zip | |
arm/tegra: Call bus_set_iommu() after iommu_device_register()
The bus_set_iommu() function will call the add_device()
call-back which needs the iommu to be registered.
Reported-by: Jon Hunter <jonathanh@nvidia.com>
Fixes: 0b480e447006 ('iommu/tegra: Add support for struct iommu_device')
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/tegra-smmu.c')
| -rw-r--r-- | drivers/iommu/tegra-smmu.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index 2802e12e6a54..3b6449e2cbf1 100644 --- 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); |
