From: Dan Carpenter Date: Wed, 21 Aug 2013 08:34:20 +0000 (+0100) Subject: iommu/arm-smmu: fix iommu_present() test in init X-Git-Tag: v3.11.5~75 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81ac5e7f75c97089f3e86955768f81096c7c5c22;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Dan Carpenter Signed-off-by: Will Deacon Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 32b22ec5aad15..a50f951c02598 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;