Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu',...

[firefly-linux-kernel-4.4.55.git] / drivers / iommu / ipmmu-vmsa.c

diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index e509c58eee92ac9ccfda3ea13d7f0617cb900af1..99effbb17191b909f16311461ea30d1539631222 100644 (file)
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -1185,7 +1185,7 @@ static int ipmmu_probe(struct platform_device *pdev)
                               dev_name(&pdev->dev), mmu);
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to request IRQ %d\n", irq);
-               return irq;
+               return ret;
        }
 
        ipmmu_device_reset(mmu);