diff options
-rw-r--r-- | drivers/iommu/msm_iommu.c | 3 | ||||
-rw-r--r-- | drivers/iommu/msm_iommu_dev.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c index 6e3dcc289d59..3e4d888bef2b 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu.c | |||
@@ -73,8 +73,7 @@ fail: | |||
73 | 73 | ||
74 | static void __disable_clocks(struct msm_iommu_drvdata *drvdata) | 74 | static void __disable_clocks(struct msm_iommu_drvdata *drvdata) |
75 | { | 75 | { |
76 | if (drvdata->clk) | 76 | clk_disable(drvdata->clk); |
77 | clk_disable(drvdata->clk); | ||
78 | clk_disable(drvdata->pclk); | 77 | clk_disable(drvdata->pclk); |
79 | } | 78 | } |
80 | 79 | ||
diff --git a/drivers/iommu/msm_iommu_dev.c b/drivers/iommu/msm_iommu_dev.c index 61def7cb5263..9574d217227c 100644 --- a/drivers/iommu/msm_iommu_dev.c +++ b/drivers/iommu/msm_iommu_dev.c | |||
@@ -224,8 +224,7 @@ static int msm_iommu_probe(struct platform_device *pdev) | |||
224 | 224 | ||
225 | platform_set_drvdata(pdev, drvdata); | 225 | platform_set_drvdata(pdev, drvdata); |
226 | 226 | ||
227 | if (iommu_clk) | 227 | clk_disable(iommu_clk); |
228 | clk_disable(iommu_clk); | ||
229 | 228 | ||
230 | clk_disable(iommu_pclk); | 229 | clk_disable(iommu_pclk); |
231 | 230 | ||
@@ -323,8 +322,7 @@ static int msm_iommu_ctx_probe(struct platform_device *pdev) | |||
323 | SET_NSCFG(drvdata->base, mid, 3); | 322 | SET_NSCFG(drvdata->base, mid, 3); |
324 | } | 323 | } |
325 | 324 | ||
326 | if (drvdata->clk) | 325 | clk_disable(drvdata->clk); |
327 | clk_disable(drvdata->clk); | ||
328 | clk_disable(drvdata->pclk); | 326 | clk_disable(drvdata->pclk); |
329 | 327 | ||
330 | dev_info(&pdev->dev, "context %s using bank %d\n", c->name, c->num); | 328 | dev_info(&pdev->dev, "context %s using bank %d\n", c->name, c->num); |