From a8bd7f67dcfc66bd5f3e10f9f44d0ccad4d8788e Mon Sep 17 00:00:00 2001 From: Mathew Joseph Karimpanal Date: Wed, 16 Mar 2016 11:48:34 -0700 Subject: [PATCH] iommu/arm-smmu: Defer SMMU probe if clock-tree is not ready A few clocks like gpu_ahb_clk may be available late on some platforms like on boards that use an I2C-controlled off-SoC power regulator. Defer SMMU probe if clock-tree is not ready. CRs-fixed: 971957 Change-Id: I3f13b36affa0a904bda7175d0dacff298794a906 Signed-off-by: Mathew Joseph Karimpanal --- drivers/iommu/arm-smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 9be51cdfa717..2604e53139ab 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -3237,7 +3237,7 @@ static int arm_smmu_init_clocks(struct arm_smmu_device *smmu) if (IS_ERR(c)) { dev_err(dev, "Couldn't get clock: %s", cname); - return -ENODEV; + return PTR_ERR(c); } if (clk_get_rate(c) == 0) {