aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-08-21 04:34:20 -0400
committerWill Deacon <will.deacon@arm.com>2013-09-17 07:03:11 -0400
commit6614ee77f49d37f9bb77eb3e81431ca8fcc4042e (patch)
treec5aaf15a525eb4d0cb09934f4c07bd8109155e4b /drivers/iommu
parentfaea13b72dbdb77e4d6ad83344596486611708b0 (diff)
iommu/arm-smmu: fix iommu_present() test in init
The extra semi-colon on the end breaks the test. Cc: <stable@vger.kernel.org> Tested-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/arm-smmu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 7243af3b891f..913bd1565e41 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1967,10 +1967,10 @@ static int __init arm_smmu_init(void)
1967 return ret; 1967 return ret;
1968 1968
1969 /* Oh, for a proper bus abstraction */ 1969 /* Oh, for a proper bus abstraction */
1970 if (!iommu_present(&platform_bus_type)); 1970 if (!iommu_present(&platform_bus_type))
1971 bus_set_iommu(&platform_bus_type, &arm_smmu_ops); 1971 bus_set_iommu(&platform_bus_type, &arm_smmu_ops);
1972 1972
1973 if (!iommu_present(&amba_bustype)); 1973 if (!iommu_present(&amba_bustype))
1974 bus_set_iommu(&amba_bustype, &arm_smmu_ops); 1974 bus_set_iommu(&amba_bustype, &arm_smmu_ops);
1975 1975
1976 return 0; 1976 return 0;