diff options
| -rw-r--r-- | drivers/iommu/msm_iommu.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c index 08a90b88e40d..cee307e86606 100644 --- a/drivers/iommu/msm_iommu.c +++ b/drivers/iommu/msm_iommu.c | |||
| @@ -482,23 +482,19 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va, | |||
| 482 | 482 | ||
| 483 | priv = domain->priv; | 483 | priv = domain->priv; |
| 484 | 484 | ||
| 485 | if (!priv) { | 485 | if (!priv) |
| 486 | ret = -ENODEV; | ||
| 487 | goto fail; | 486 | goto fail; |
| 488 | } | ||
| 489 | 487 | ||
| 490 | fl_table = priv->pgtable; | 488 | fl_table = priv->pgtable; |
| 491 | 489 | ||
| 492 | if (len != SZ_16M && len != SZ_1M && | 490 | if (len != SZ_16M && len != SZ_1M && |
| 493 | len != SZ_64K && len != SZ_4K) { | 491 | len != SZ_64K && len != SZ_4K) { |
| 494 | pr_debug("Bad length: %d\n", len); | 492 | pr_debug("Bad length: %d\n", len); |
| 495 | ret = -EINVAL; | ||
| 496 | goto fail; | 493 | goto fail; |
| 497 | } | 494 | } |
| 498 | 495 | ||
| 499 | if (!fl_table) { | 496 | if (!fl_table) { |
| 500 | pr_debug("Null page table\n"); | 497 | pr_debug("Null page table\n"); |
| 501 | ret = -EINVAL; | ||
| 502 | goto fail; | 498 | goto fail; |
| 503 | } | 499 | } |
| 504 | 500 | ||
| @@ -507,7 +503,6 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va, | |||
| 507 | 503 | ||
| 508 | if (*fl_pte == 0) { | 504 | if (*fl_pte == 0) { |
| 509 | pr_debug("First level PTE is 0\n"); | 505 | pr_debug("First level PTE is 0\n"); |
| 510 | ret = -ENODEV; | ||
| 511 | goto fail; | 506 | goto fail; |
| 512 | } | 507 | } |
| 513 | 508 | ||
