From cd8c68cd4425ac0c5461abe0a63374e866b4e80a Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Thu, 26 Jan 2012 18:25:37 +0100 Subject: [PATCH] --- yaml --- r: 287375 b: refs/heads/master c: 05df1f3c2afaef5672627f2b7095f0d4c4dbc3a0 h: refs/heads/master i: 287373: cabbd12b3b69a3d84cf47d227b21826f995d8aa9 287371: 8d296cb916bc537b4503747e0e422d43c857cdcb 287367: 133ecf4c4dcd8f707cc7be53340f4620d0d9ed58 287359: a5f9cfd2669741d71841863a3fb70a86e6811403 v: v3 --- [refs] | 2 +- trunk/drivers/iommu/msm_iommu.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f8581aa78a6c..6f5ffe5b8a59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af1be04901e27ce669b4ecde1c953d5c939498f5 +refs/heads/master: 05df1f3c2afaef5672627f2b7095f0d4c4dbc3a0 diff --git a/trunk/drivers/iommu/msm_iommu.c b/trunk/drivers/iommu/msm_iommu.c index 08a90b88e40d..cee307e86606 100644 --- a/trunk/drivers/iommu/msm_iommu.c +++ b/trunk/drivers/iommu/msm_iommu.c @@ -482,23 +482,19 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va, priv = domain->priv; - if (!priv) { - ret = -ENODEV; + if (!priv) goto fail; - } fl_table = priv->pgtable; if (len != SZ_16M && len != SZ_1M && len != SZ_64K && len != SZ_4K) { pr_debug("Bad length: %d\n", len); - ret = -EINVAL; goto fail; } if (!fl_table) { pr_debug("Null page table\n"); - ret = -EINVAL; goto fail; } @@ -507,7 +503,6 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va, if (*fl_pte == 0) { pr_debug("First level PTE is 0\n"); - ret = -ENODEV; goto fail; }