summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-08-21 09:34:20 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-13 18:14:27 -0700
commit81ac5e7f75c97089f3e86955768f81096c7c5c22 (patch)
treef397f469b9f9ae08db35527bf0285e331a95f124 /drivers
parent5f854447d6119d0dc79680fe0c1ced324fe2e03b (diff)
iommu/arm-smmu: fix iommu_present() test in init
commit 6614ee77f49d37f9bb77eb3e81431ca8fcc4042e upstream. The extra semi-colon on the end breaks the test. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-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 32b22ec5aad1..a50f951c0259 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1948,10 +1948,10 @@ static int __init arm_smmu_init(void)
return ret;
/* Oh, for a proper bus abstraction */
- if (!iommu_present(&platform_bus_type));
+ if (!iommu_present(&platform_bus_type))
bus_set_iommu(&platform_bus_type, &arm_smmu_ops);
- if (!iommu_present(&amba_bustype));
+ if (!iommu_present(&amba_bustype))
bus_set_iommu(&amba_bustype, &arm_smmu_ops);
return 0;