]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iommu/arm-smmu: fix iommu_present() test in init
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 21 Aug 2013 08:34:20 +0000 (09:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Oct 2013 01:14:27 +0000 (18:14 -0700)
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>
drivers/iommu/arm-smmu.c

index 32b22ec5aad156fd1cb7c59059cbf41343cc6501..a50f951c02598e2f337235402800e82fe27191cc 100644 (file)
@@ -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;